[PATCH 2/4] all: re-tag APNs according to the new dtd 1/3



---
 serviceproviders.xml |  544 +++++++++++++++++++++++++-------------------------
 1 files changed, 272 insertions(+), 272 deletions(-)

diff --git a/serviceproviders.xml b/serviceproviders.xml
index a5e82fb..019e7f4 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -44,14 +44,14 @@ conceived.
 		<name>Etisalat</name>
 		<gsm>
 			<network-id mcc="424" mnc="02"/>
-			<apn value="mnet">
+			<apn value="mnet" type="internet" plan="postpaid">
 				<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">
+			<apn value="etisalat.ae" type="internet" plan="postpaid">
 				<name>Etisalat 3G</name>
 				<username>etisalat.ae</username>
 				<password>etisalat.ae</password>
@@ -62,7 +62,7 @@ conceived.
 		<name>du</name>
 		<gsm>
 			<network-id mcc="424" mnc="03"/>
-			<apn value="du"/>
+			<apn value="du" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -73,7 +73,7 @@ conceived.
 		<name>AWCC</name>
 		<gsm>
 			<network-id mcc="412" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>awcc</username>
 				<password>1111</password>
 			</apn>
@@ -87,10 +87,10 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="276" mnc="02"/>
-			<apn value="Twa">
+			<apn value="Twa" type="internet" plan="postpaid">
 				<name>TWA</name>
 			</apn>
-			<apn value="vodafoneweb">
+			<apn value="vodafoneweb" type="internet" plan="postpaid">
 				<name>Vodafone Web</name>
 			</apn>
 		</gsm>
@@ -103,7 +103,7 @@ conceived.
 		<name>Beeline</name>
 		<gsm>
 			<network-id mcc="283" mnc="01"/>
-			<apn value="internet.beeline.am">
+			<apn value="internet.beeline.am" type="internet" plan="postpaid">
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -113,10 +113,10 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="283" mnc="10"/>
-			<apn value="internet.orange">
+			<apn value="internet.orange" type="internet" plan="postpaid">
 				<name>Internet Hima (USB)</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -125,10 +125,10 @@ conceived.
 		<name>VivaCell/MTS</name>
 		<gsm>
 			<network-id mcc="283" mnc="05"/>
-			<apn value="connect.vivacell.am">
+			<apn value="connect.vivacell.am" type="internet" plan="postpaid">
 				<name>MTS connect</name>
 			</apn>
-			<apn value="inet.vivacell.am">
+			<apn value="inet.vivacell.am" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -148,7 +148,7 @@ conceived.
 		<name>Unitel</name>
 		<gsm>
 			<network-id mcc="631" mnc="02"/>
-			<apn value="internet.unitel.co.ao" />
+			<apn value="internet.unitel.co.ao" type="internet" plan="postpaid" />
 		</gsm>
 	</provider>
 </country>
@@ -159,7 +159,7 @@ conceived.
 		<name>Personal</name>
 		<gsm>
 			<network-id mcc="722" mnc="340"/>
-			<apn value="gprs.personal.com">
+			<apn value="gprs.personal.com" type="internet" plan="postpaid">
 				<username>gprs</username>
 				<password>adgj</password>
 				<dns>172.25.7.6</dns>
@@ -171,7 +171,7 @@ conceived.
 		<name>Arnet</name>
 		<gsm>
 			<network-id mcc="722" mnc="340"/>
-			<apn value="arnet.personal.com">
+			<apn value="arnet.personal.com" type="internet" plan="postpaid">
 				<dns>172.25.7.6</dns>
 				<dns>172.25.7.7</dns>
 			</apn>
@@ -183,14 +183,14 @@ conceived.
 			<network-id mcc="722" mnc="310"/>
 			<network-id mcc="722" mnc="320"/>
 			<network-id mcc="722" mnc="330"/>
-			<apn value="gprs.claro.com.ar">
+			<apn value="gprs.claro.com.ar" type="internet" plan="postpaid">
 				<name>3G Internet</name>
 				<username>clarogprs</username>
 				<password>clarogprs999</password>
 				<dns>170.51.255.100</dns>
 				<dns>170.51.242.18</dns>
 			</apn>
-			<apn value="internet.ctimovil.com.ar">
+			<apn value="internet.ctimovil.com.ar" type="internet" plan="postpaid">
 				<name>GPRS</name>
 				<username>clarogprs</username>
 				<password>clarogprs999</password>
@@ -202,7 +202,7 @@ conceived.
 		<gsm>
 			<network-id mcc="722" mnc="010"/>
 			<network-id mcc="722" mnc="070"/>
-			<apn value="internet.gprs.unifon.com.ar">
+			<apn value="internet.gprs.unifon.com.ar" type="internet" plan="postpaid">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -217,19 +217,19 @@ conceived.
 		<gsm>
 			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
 			<network-id mcc="232" mnc="01"/>
-			<apn value="a1.net">
+			<apn value="a1.net" type="internet" plan="postpaid">
 				<name>A1 Breitband</name>
 				<username>ppp a1plus at</username>
 				<password>ppp</password>
 			</apn>
 			<!-- https://www.aon.at/export/sites/default/residential/pdf/produktfolder/aonFlex_Mobiltelefon.pdf-->
-			<apn value="aon.data">
+			<apn value="aon.data" type="internet" plan="postpaid">
 				<name>aon (Flex, Breitband-Duo, BusinessFlex)</name>
 				<username>mobile aon at</username>
 				<password>ppp</password>
 			</apn>
 			<!-- http://konfigurator.aon.at/otauseraon/templates/user/aon/manuals/AON_Installation.pdf -->
-			<apn value="aon.at">
+			<apn value="aon.at" type="internet" plan="postpaid">
 				<name>aonMobile</name>
 				<username>mobile aon at</username>
 				<password>ppp</password>
@@ -240,7 +240,7 @@ conceived.
 		<name>Bob</name>
 		<gsm>
 			<network-id mcc="232" mnc="11"/>
-			<apn value="bob.at">
+			<apn value="bob.at" type="internet" plan="postpaid">
 				<username>data bob at</username>
 				<password>ppp</password>
 			</apn>
@@ -250,17 +250,17 @@ conceived.
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="232" mnc="03"/>
-			<apn value="gprswap" type="wap">
+			<apn value="gprswap" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 			</apn>
-			<apn value="gprsinternet">
+			<apn value="gprsinternet" type="internet" plan="postpaid">
 				<name>Internet</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 			</apn>
-			<apn value="business.gprsinternet">
+			<apn value="business.gprsinternet" type="internet" plan="postpaid">
 				<name>Business Internet</name>
 				<username>t-mobile</username>
 				<password>tm</password>
@@ -271,7 +271,7 @@ conceived.
 		<name>tele.ring</name>
 		<gsm>
 			<network-id mcc="232" mnc="07"/>
-			<apn value="web">
+			<apn value="web" type="internet" plan="postpaid">
 				<username>web telering at</username>
 				<password>web</password>
 				<dns>212.95.31.11</dns>
@@ -283,19 +283,19 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="232" mnc="05"/>
-			<apn value="web.one.at">
+			<apn value="web.one.at" type="internet" plan="postpaid">
 				<name>OneNet Web</name>
 				<username>web</username>
 				<password>web</password>
 				<dns>194.24.128.100</dns>
 				<dns>194.24.128.102</dns>
 			</apn>
-			<apn value="fullspeed">
+			<apn value="fullspeed" type="internet" plan="postpaid">
 				<name>Web (no filtering)</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="orange.web">
+			<apn value="orange.web" type="internet" plan="postpaid">
 				<name>Orange Web</name>
 				<username>Orange</username>
 				<password>Orange</password>
@@ -307,14 +307,14 @@ conceived.
 		<name xml:lang="de">Drei</name>
 		<gsm>
 			<network-id mcc="232" mnc="10"/>
-			<apn value="drei.at"/>
+			<apn value="drei.at" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Yesss</name>
 		<gsm>
 			<network-id mcc="232" mnc="12"/>
-			<apn value="web.yesss.at"/>
+			<apn value="web.yesss.at" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -325,17 +325,17 @@ conceived.
 		<name>Exetel</name>
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
-			<apn value="exetel1"/>
+			<apn value="exetel1" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Internode</name>
 		<gsm>
 			<!-- http://www.internode.on.net/residential/broadband/3g_wireless/nodemobile_data/faq/#What_is_the_APN -->
-			<apn value="internode">
+			<apn value="internode" type="internet" plan="postpaid">
 				<name>NodeMobile Data</name>
 			</apn>
-			<apn value="splns333a1">
+			<apn value="splns333a1" type="internet" plan="postpaid">
 				<name>Old NodeMobile Data (before 2009-08-26)</name>
 			</apn>
 		</gsm>
@@ -344,17 +344,17 @@ conceived.
 		<name>Optus</name>
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Mobile Internet (handsets)</name>
 				<dns>211.29.132.12</dns>
 				<dns>198.142.0.51</dns>
 			</apn>
-			<apn value="connect">
+			<apn value="connect" type="internet" plan="postpaid">
 				<name>Wireless Broadband</name>
 				<dns>211.29.132.12</dns>
 				<dns>198.142.0.51</dns>
 			</apn>
-			<apn value="preconnect">
+			<apn value="preconnect" type="internet" plan="postpaid">
 				<name>Pre-Paid Mobile Broadband</name>
 				<dns>211.29.132.12</dns>
 				<dns>198.142.0.51</dns>
@@ -370,22 +370,22 @@ conceived.
 				<dtmf>1258888</dtmf>
 				<ussd-response>*100#</ussd-response>
 			</balance-check>
-			<apn value="telstra.wap">
+			<apn value="telstra.wap" type="internet" plan="postpaid">
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
 			</apn>
-			<apn value="telstra.datapack">
+			<apn value="telstra.datapack" type="internet" plan="postpaid">
 				<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">
+			<apn value="telstra.internet" type="internet" plan="postpaid">
 				<name>Telstra (Next G)</name>
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
 			</apn>
-			<apn value="telstra.pcpack">
+			<apn value="telstra.pcpack" type="internet" plan="postpaid">
 				<name>Telstra (3G PC pack - pay by time)</name>
 				<password>Telstra</password>
 				<dns>139.130.4.4</dns>
@@ -397,13 +397,13 @@ conceived.
 		<name>Three</name>
 		<gsm>
 			<network-id mcc="505" mnc="06"/>
-			<apn value="3netaccess">
+			<apn value="3netaccess" type="internet" plan="postpaid">
 				<username>a</username>
 				<password>a</password>
 				<dns>202.124.68.130</dns>
 				<dns>202.124.76.66</dns>
 			</apn>
-			<apn value="3services" type="prepaid">
+			<apn value="3services" type="internet" plan="prepaid">
 				<name>Three Prepaid</name>
 				<username>a</username>
 				<password>a</password>
@@ -416,13 +416,13 @@ conceived.
 		<name>Virgin Mobile</name>
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
-			<apn value="VirginInternet">
+			<apn value="VirginInternet" type="internet" plan="postpaid">
 				<name>Mobile Internet</name>
 				<username>guest</username>
 				<password>guest</password>
 				<dns>61.88.88.88</dns>
 			</apn>
-			<apn value="VirginBroadband">
+			<apn value="VirginBroadband" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -432,12 +432,12 @@ conceived.
 		<gsm>
 			<!-- http://www.vodafone.com.au/personal/mobile-broadband/modem-setup/index.htm -->
 			<network-id mcc="505" mnc="03"/>
-			<apn value="vfinternet.au">
+			<apn value="vfinternet.au" type="internet" plan="postpaid">
 				<name>Postpaid and some prepaid phone plans</name>
 			</apn>
 			<!-- username/password included in Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
 			<!-- username/password not on site http://www.vodafone.com.au/personal/mobile-broadband/modem-setup/index.htm -->
-			<apn value="vfprepaymbb" type="prepaid">
+			<apn value="vfprepaymbb" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<!-- username>web</username -->
 				<!-- password>web</password -->
@@ -448,7 +448,7 @@ conceived.
 		<name>Crazy John's</name>
 		<gsm>
 			<network-id mcc="505" mnc="38"/>
-			<apn value="purtona.net"/>
+			<apn value="purtona.net" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -459,21 +459,21 @@ conceived.
 		<name>Azercell</name>
 		<gsm>
 			<network-id mcc="400" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Bakcell</name>
 		<gsm>
 			<network-id mcc="400" mnc="02"/>
-			<apn value="mms"/>
+			<apn value="mms" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Azerfon</name>
 		<gsm>
 			<network-id mcc="400" mnc="04"/>
-			<apn value="azerfon"/>
+			<apn value="azerfon" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -484,7 +484,7 @@ conceived.
 		<name>BH GSM</name>
 		<gsm>
 			<network-id mcc="218" mnc="90"/>
-			<apn value="mms.bhmobile.ba" type="mms"/>
+			<apn value="mms.bhmobile.ba" type="mms" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -494,27 +494,27 @@ conceived.
 			<balance-check>
 				<ussd>*101#</ussd>
 			</balance-check>
-			<apn value="mtelgprs1">
+			<apn value="mtelgprs1" type="internet" plan="postpaid">
 				<name>Package 1</name>
 				<dns>81.93.67.2</dns>
 				<dns>81.93.67.3</dns>
 			</apn>
-			<apn value="mtelgprs2">
+			<apn value="mtelgprs2" type="internet" plan="postpaid">
 				<name>Package 2</name>
 				<dns>81.93.67.2</dns>
 				<dns>81.93.67.3</dns>
 			</apn>
-			<apn value="mtelgprs3">
+			<apn value="mtelgprs3" type="internet" plan="postpaid">
 				<name>Package 3</name>
 				<dns>81.93.67.2</dns>
 				<dns>81.93.67.3</dns>
 			</apn>
-			<apn value="mtelgprs4">
+			<apn value="mtelgprs4" type="internet" plan="postpaid">
 				<name>Package 4</name>
 				<dns>81.93.67.2</dns>
 				<dns>81.93.67.3</dns>
 			</apn>
-			<apn value="mtelfun" type="prepaid">
+			<apn value="mtelfun" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<dns>81.93.67.2</dns>
 				<dns>81.93.67.3</dns>
@@ -528,7 +528,7 @@ conceived.
 			<balance-check>
 				<ussd>*101#</ussd>
 			</balance-check>
-			<apn value="gprs.eronet.ba"/>
+			<apn value="gprs.eronet.ba" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -539,7 +539,7 @@ conceived.
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="342" mnc="750"/>
-			<apn value="isp.digicelbarbados.com"/>
+			<apn value="isp.digicelbarbados.com" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -550,7 +550,7 @@ conceived.
 		<name>Robi (AKTel)</name>
 		<gsm>
 			<network-id mcc="470" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Internet</name>
 				<dns>192.168.23.7</dns>
 			</apn>
@@ -560,7 +560,7 @@ conceived.
 		<name>Banglalink</name>
 		<gsm>
 			<network-id mcc="470" mnc="03"/>
-			<apn value="blweb">
+			<apn value="blweb" type="internet" plan="postpaid">
 				<name>Web</name>
 				<dns>10.10.55.34</dns>
 			</apn>
@@ -570,7 +570,7 @@ conceived.
 		<name>GrameenPhone</name>
 		<gsm>
 			<network-id mcc="470" mnc="01"/>
-			<apn value="gpinternet">
+			<apn value="gpinternet" type="internet" plan="postpaid">
 				<dns>202.56.4.120</dns>
 				<dns>202.56.4.121</dns>
 			</apn>
@@ -580,7 +580,7 @@ conceived.
 		<name>Warid</name>
 		<gsm>
 			<network-id mcc="470" mnc="07"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Internet</name>
 				<dns>10.6.0.2</dns>
 			</apn>
@@ -604,21 +604,21 @@ conceived.
 		<name>Mobistar</name>
 		<gsm>
 			<network-id mcc="206" mnc="10"/>
-			<apn value="web.pro.be">
+			<apn value="web.pro.be" type="internet" plan="postpaid">
 				<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">
+			<apn value="internet.be" type="internet" plan="postpaid">
 				<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">
+			<apn value="iew.be" type="internet" plan="postpaid">
 				<name>Internet Everywhere</name>
 				<username>mobistar</username>
 				<password>mobistar</password>
@@ -631,10 +631,10 @@ conceived.
 		<name>Telenet Mobile</name>
 		<gsm>
 			<network-id mcc="206" mnc="10"/>
-			<apn value="telenetwap.be">
+			<apn value="telenetwap.be" type="internet" plan="postpaid">
 				<name>Walk &amp; Talk</name>
 			</apn>
-			<apn value="telenetwap.be">
+			<apn value="telenetwap.be" type="internet" plan="postpaid">
 				<name>Walk &amp; Surf</name>
 			</apn>
 		</gsm>
@@ -643,17 +643,17 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="206" mnc="10"/>
-			<apn value="orangeinternet"/>
+			<apn value="orangeinternet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Proximus</name>
 		<gsm>
 			<network-id mcc="206" mnc="01"/>
-			<apn value="internet.proximus.be">
+			<apn value="internet.proximus.be" type="internet" plan="postpaid">
 				<name>Inter</name>
 			</apn>
-			<apn value="intraprox.be">
+			<apn value="intraprox.be" type="internet" plan="postpaid">
 				<name>Intra</name>
 				<dns>195.238.2.21</dns>
 				<dns>195.238.2.22</dns>
@@ -664,7 +664,7 @@ conceived.
 		<name>Base</name>
 		<gsm>
 			<network-id mcc="206" mnc="20"/>
-			<apn value="gprs.base.be">
+			<apn value="gprs.base.be" type="internet" plan="postpaid">
 				<username>base</username>
 				<password>base</password>
 				<dns>195.130.131.139</dns>
@@ -680,7 +680,7 @@ conceived.
 		<name>GloBul</name>
 		<gsm>
 			<network-id mcc="284" mnc="05"/>
-			<apn value="internet.globul.bg">
+			<apn value="internet.globul.bg" type="internet" plan="postpaid">
 				<username>globul</username>
 				<dns>192.168.88.11</dns>
 			</apn>
@@ -692,7 +692,7 @@ conceived.
 			<network-id mcc="284" mnc="01"/>
 			<!-- http://www.mtel.bg/iphone3/technical_faq.php lists username/password -->
 			<!-- username/password not included in Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
-			<apn value="inet-gprs.mtel.bg">
+			<apn value="inet-gprs.mtel.bg" type="internet" plan="postpaid">
 				<username>mtel</username>
 				<password>mtel</password>
 			</apn>
@@ -702,13 +702,13 @@ conceived.
 		<name>Vivacom</name>
 		<gsm>
 			<network-id mcc="284" mnc="03"/>
-			<apn value="internet.vivacom.bg">
+			<apn value="internet.vivacom.bg" type="internet" plan="postpaid">
 				<!-- http://www.vivacom.bg/en/residential/help_and_advice/common_questions/mobile_postpaid/8/ -->
 				<name>Vivacom Internet (Postpaid)</name>
 				<username>vivacom</username>
 				<password>vivacom</password>
 			</apn>
-			<apn value="internet.vivatel.bg">
+			<apn value="internet.vivatel.bg" type="internet" plan="postpaid">
 				<name>Vivatel (old)</name>
 				<username>vivatel</username>
 				<password>vivatel</password>
@@ -724,7 +724,7 @@ conceived.
 		<name>Batelco</name>
 		<gsm>
 			<network-id mcc="426" mnc="01"/>
-			<apn value="internet.batelco.com">
+			<apn value="internet.batelco.com" type="internet" plan="postpaid">
 				<name>oNet</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -735,12 +735,12 @@ conceived.
 		<name>Zain BH</name>
 		<gsm>
 			<network-id mcc="426" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Internet</name>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
-			<apn value="hsdpa">
+			<apn value="hsdpa" type="internet" plan="postpaid">
 				<name>eGO</name>
 				<username>hsdpa</username>
 				<password>hsdpa</password>
@@ -751,7 +751,7 @@ conceived.
 		<name>STC</name>
 		<gsm>
 			<network-id mcc="426" mnc="04"/>
-			<apn value="viva.bh">
+			<apn value="viva.bh" type="internet" plan="postpaid">
 				<name>Viva</name>
 			</apn>
 		</gsm>
@@ -767,7 +767,7 @@ conceived.
 		<name>Brasil Telecom</name>
 		<gsm>
 			<network-id mcc="724" mnc="16"/>
-			<apn value="brt.br">
+			<apn value="brt.br" type="internet" plan="postpaid">
 				<username>BrT</username>
 				<password>BrT</password>
 			</apn>
@@ -777,11 +777,11 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="724" mnc="05"/>
-			<apn value="claro.com.br">
+			<apn value="claro.com.br" type="internet" plan="postpaid">
 				<username>claro</username>
 				<password>claro</password>
 			</apn>
-			<apn value="bandalarga.claro.com.br">
+			<apn value="bandalarga.claro.com.br" type="internet" plan="postpaid">
 				<name>3G</name>
 				<username>claro</username>
 				<password>claro</password>
@@ -795,7 +795,7 @@ conceived.
 			<network-id mcc="724" mnc="32"/>
 			<network-id mcc="724" mnc="33"/>
 			<network-id mcc="724" mnc="34"/>
-			<apn value="ctbc.br">
+			<apn value="ctbc.br" type="internet" plan="postpaid">
 				<username>ctbc</username>
 				<password>1212</password>
 			</apn>
@@ -808,10 +808,10 @@ conceived.
 			<network-id mcc="724" mnc="31"/>
 			<network-id mcc="724" mnc="24"/>
 
-			<apn value="gprs.oi.com.br">
+			<apn value="gprs.oi.com.br" type="internet" plan="postpaid">
 				<password>oioioi</password>
 			</apn>
-			<apn value="wapgprs.oi.com.br" type="wap">
+			<apn value="wapgprs.oi.com.br" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>oiwap</username>
 				<password>oioioi</password>
@@ -826,7 +826,7 @@ conceived.
 			<network-id mcc="724" mnc="04"/>
 			<network-id mcc="724" mnc="08"/>
 
-			<apn value="tim.br">
+			<apn value="tim.br" type="internet" plan="postpaid">
 				<username>tim</username>
 				<password>tim</password>
 				<dns>10.223.246.102</dns>
@@ -837,7 +837,7 @@ conceived.
 	<provider>
 		<name>Velox</name>
 		<gsm>
-			<apn value="wap.telcel.com">
+			<apn value="wap.telcel.com" type="internet" plan="postpaid">
 				<username>iesgprs</username>
 				<password>iesgprs2002</password>
 				<dns>66.36.250.14</dns>
@@ -852,7 +852,7 @@ conceived.
 			<network-id mcc="724" mnc="11"/>
 			<network-id mcc="724" mnc="23"/>
 
-			<apn value="zap.vivo.com.br">
+			<apn value="zap.vivo.com.br" type="internet" plan="postpaid">
 				<username>vivo</username>
 				<password>vivo</password>
 			</apn>
@@ -866,7 +866,7 @@ conceived.
 		<name>Batelco</name>
 		<gsm>
 			<network-id mcc="364" mnc="390"/>
-			<apn value="internet.btcbahamas.com"/>
+			<apn value="internet.btcbahamas.com" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -877,14 +877,14 @@ conceived.
 		<name>B-Mobile</name>
 		<gsm>
 			<network-id mcc="528" mnc="02"/>
-			<apn value="bmobilewap"/>
+			<apn value="bmobilewap" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>DSTCOM</name>
 		<gsm>
 			<network-id mcc="528" mnc="11"/>
-			<apn value="dst.wap">
+			<apn value="dst.wap" type="internet" plan="postpaid">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -899,42 +899,42 @@ conceived.
 		<name>velcom</name>
 		<gsm>
 			<network-id mcc="257" mnc="01"/>
-			<apn value="wap.velcom.by" type="wap">
+			<apn value="wap.velcom.by" type="wap" plan="postpaid">
 				<name>GPRS WAP</name>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
-			<apn value="web.velcom.by">
+			<apn value="web.velcom.by" type="internet" plan="postpaid">
 				<name>GPRS WEB</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="plus.velcom.by">
+			<apn value="plus.velcom.by" type="internet" plan="postpaid">
 				<name>GPRS WEB PLUS</name>
 				<username>plus</username>
 				<password>plus</password>
 			</apn>
-			<apn value="privet.velcom.by">
+			<apn value="privet.velcom.by" type="internet" plan="postpaid">
 				<name>GPRS PRIVET</name>
 				<username>privet</username>
 				<password>privet</password>
 			</apn>
-			<apn value="web1.velcom.by">
+			<apn value="web1.velcom.by" type="internet" plan="postpaid">
 				<name>WEB BASIC</name>
 				<username>web1</username>
 				<password>web1</password>
 			</apn>
-			<apn value="web2.velcom.by">
+			<apn value="web2.velcom.by" type="internet" plan="postpaid">
 				<name>WEB 25</name>
 				<username>web2</username>
 				<password>web2</password>
 			</apn>
-			<apn value="web3.velcom.by">
+			<apn value="web3.velcom.by" type="internet" plan="postpaid">
 				<name>WEB 150</name>
 				<username>web3</username>
 				<password>web3</password>
 			</apn>
-			<apn value="vmi.velcom.by">
+			<apn value="vmi.velcom.by" type="internet" plan="postpaid">
 				<name>WEB 500</name>
 				<username>vmi</username>
 				<password>vmi</password>
@@ -945,7 +945,7 @@ conceived.
 		<name>MTS</name>
 		<gsm>
 			<network-id mcc="257" mnc="02"/>
-			<apn value="internet.mts.by">
+			<apn value="internet.mts.by" type="internet" plan="postpaid">
 				<username>mts</username>
 				<password>mts</password>
 			</apn>
@@ -956,7 +956,7 @@ conceived.
 		<name>life:)</name>
 		<gsm>
 			<network-id mcc="257" mnc="03"/>
-			<apn value="internet.life.com.by"/>
+			<apn value="internet.life.com.by" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -967,7 +967,7 @@ conceived.
 		<name>Mascom Wireless</name>
 		<gsm>
 			<network-id mcc="652" mnc="01"/>
-			<apn value="internet.mascom"/>
+			<apn value="internet.mascom" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -978,14 +978,14 @@ conceived.
 		<name>Leo/UCom</name>
 		<gsm>
 			<network-id mcc="642" mnc="03"/>
-			<apn value="ucnet"/>
+			<apn value="ucnet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tempo/Africell</name>
 		<gsm>
 			<network-id mcc="642" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -996,7 +996,7 @@ conceived.
 		<name>Fido</name>
 		<gsm>
 			<network-id mcc="302" mnc="370"/>
-			<apn value="internet.fido.ca">
+			<apn value="internet.fido.ca" type="internet" plan="postpaid">
 				<username>fido</username>
 				<password>fido</password>
 				<dns>204.92.15.211</dns>
@@ -1008,7 +1008,7 @@ conceived.
 		<name>Rogers</name>
 		<gsm>
 			<network-id mcc="302" mnc="720"/>
-			<apn value="internet.com">
+			<apn value="internet.com" type="internet" plan="postpaid">
 				<username>wapuser1</username>
 				<password>wap</password>
 				<dns>207.181.101.4</dns>
@@ -1023,10 +1023,10 @@ conceived.
 			<network-id mcc="302" mnc="640"/>
 			<network-id mcc="302" mnc="651"/>
 			<network-id mcc="302" mnc="880"/>
-			<apn value="inet.bell.ca">
+			<apn value="inet.bell.ca" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
-			<apn value="pda.bell.ca">
+			<apn value="pda.bell.ca" type="internet" plan="postpaid">
 				<name>Mobile Web</name>
 			</apn>
 		</gsm>
@@ -1064,16 +1064,16 @@ conceived.
 			<network-id mcc="302" mnc="220"/>
 			<network-id mcc="302" mnc="860"/>
 			<network-id mcc="302" mnc="880"/>
-			<apn value="isp.telus.com">
+			<apn value="isp.telus.com" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
-			<apn value="vpn.telus.com">
+			<apn value="vpn.telus.com" type="internet" plan="postpaid">
 				<name>Internet (with VPN)</name>
 			</apn>
-			<apn value="bb.telus.com">
+			<apn value="bb.telus.com" type="internet" plan="postpaid">
 				<name>Blackberry</name>
 			</apn>
-			<apn value="sp.telus.com">
+			<apn value="sp.telus.com" type="internet" plan="postpaid">
 				<name>Mobile Web/Smartphone</name>
 			</apn>
 		</gsm>
@@ -1103,7 +1103,7 @@ conceived.
 		<gsm>
 			<network-id mcc="302" mnc="500"/>
 			<network-id mcc="302" mnc="510"/>
-			<apn value="ihvm.videotron">
+			<apn value="ihvm.videotron" type="internet" plan="postpaid">
 				<name>IHVM</name>
 			</apn>
 		</gsm>
@@ -1112,10 +1112,10 @@ conceived.
 		<name>WIND Mobile</name>
 		<gsm>
 			<network-id mcc="302" mnc="490"/>
-			<apn value="broadband.windmobile.ca">
+			<apn value="broadband.windmobile.ca" type="internet" plan="postpaid">
 				<name>Laptop (data stick)</name>
 			</apn>
-			<apn value="internet.windmobile.ca">
+			<apn value="internet.windmobile.ca" type="internet" plan="postpaid">
 				<name>Mobile (add-on for phone)</name>
 			</apn>
 		</gsm>
@@ -1124,10 +1124,10 @@ conceived.
 		<name>Mobilicity</name>
 		<gsm>
 			<network-id mcc="302" mnc="320"/>
-			<apn value="wap.davewireless.com">
+			<apn value="wap.davewireless.com" type="internet" plan="postpaid">
 				<name>Mobile Web</name>
 			</apn>
-			<apn value="internet.davewireless.com">
+			<apn value="internet.davewireless.com" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -1140,7 +1140,7 @@ conceived.
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="630" mnc="01"/>
-			<apn value="vodanet">
+			<apn value="vodanet" type="internet" plan="postpaid">
 				<username>vodalive</username>
 			</apn>
 		</gsm>
@@ -1157,15 +1157,15 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="228" mnc="03"/>
-			<apn value="mobileoffice3g">
+			<apn value="mobileoffice3g" type="internet" plan="postpaid">
 				<name>Internet Everywhere - Standard</name>
 				<dns>213.55.128.1</dns>
 				<dns>213.55.128.2</dns>
 			</apn>
-			<apn value="click" type="prepaid">
+			<apn value="click" type="internet" plan="prepaid">
 				<name>Internet Everywhere - Prepaid</name>
 			</apn>
-			<apn value="intranetaccess">
+			<apn value="intranetaccess" type="internet" plan="postpaid">
 				<name>Internet Everywhere - Intranet Access</name>
 			</apn>
 		</gsm>
@@ -1174,7 +1174,7 @@ conceived.
 		<name>Sunrise</name>
 		<gsm>
 			<network-id mcc="228" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -1192,7 +1192,7 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*130*CODE#</ussd>
 			</balance-top-up>
-			<apn value="gprs.swisscom.ch"/>
+			<apn value="gprs.swisscom.ch" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -1203,7 +1203,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="612" mnc="05"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>172.16.100.5</dns>
 			</apn>
 		</gsm>
@@ -1216,16 +1216,16 @@ conceived.
 		<name>Claro Chile</name>
 		<gsm>
 			<network-id mcc="730" mnc="03"/>
-			<apn value="bam.clarochile.cl">
+			<apn value="bam.clarochile.cl" type="internet" plan="postpaid">
 				<username>clarochile</username>
 				<password>clarochile</password>
 			</apn>
-			<apn value="bap.clarochile.cl" type="prepaid">
+			<apn value="bap.clarochile.cl" type="internet" plan="prepaid">
 				<name>Prepago</name>
 				<username>clarochile</username>
 				<password>clarochile</password>
 			</apn>
-			<apn value="wap.clarochile.cl" type="wap">
+			<apn value="wap.clarochile.cl" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>clarochile</username>
 				<password>clarochile</password>
@@ -1236,12 +1236,12 @@ conceived.
 		<name>Entel PCS</name>
 		<gsm>
 			<network-id mcc="730" mnc="01"/>
-			<apn value="imovil.entelpcs.cl">
+			<apn value="imovil.entelpcs.cl" type="internet" plan="postpaid">
 				<name>Contract / Prepaid / WebSession</name>
 				<username>entelpcs</username>
 				<password>entelpcs</password>
 			</apn>
-			<apn value="bam.entelpcs.cl">
+			<apn value="bam.entelpcs.cl" type="internet" plan="postpaid">
 				<name>WAP</name>
 				<username>entelpcs</username>
 				<password>entelpcs</password>
@@ -1252,12 +1252,12 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="730" mnc="10"/>
-			<apn value="web.tmovil.cl">
+			<apn value="web.tmovil.cl" type="internet" plan="postpaid">
 				<name>Web</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="wap.tmovil.cl" type="wap">
+			<apn value="wap.tmovil.cl" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -1272,7 +1272,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="624" mnc="02"/>
-			<apn value="orangecmgprs">
+			<apn value="orangecmgprs" type="internet" plan="postpaid">
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
@@ -1282,7 +1282,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="624" mnc="01"/>
-			<apn value="INTERNET">
+			<apn value="INTERNET" type="internet" plan="postpaid">
 				<username>guest</username>
 				<password>guest</password>
 			</apn>
@@ -1297,12 +1297,12 @@ conceived.
 		<gsm>
 			<network-id mcc="460" mnc="00"/>
 			<network-id mcc="460" mnc="02"/>
-			<apn value="cmwap" type="wap">
+			<apn value="cmwap" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>guest</username>
 				<password>guest</password>
 			</apn>
-			<apn value="cmnet">
+			<apn value="cmnet" type="internet" plan="postpaid">
 				<name>Internet</name>
 				<username>guest</username>
 				<password>guest</password>
@@ -1314,7 +1314,7 @@ conceived.
 		<name>China Unicom</name>
 		<gsm>
 			<network-id mcc="460" mnc="01"/>
-			<apn value="uninet">
+			<apn value="uninet" type="internet" plan="postpaid">
 				<username>uninet</username>
 			</apn>
 		</gsm>
@@ -1337,7 +1337,7 @@ conceived.
 		<gsm>
 			<network-id mcc="712" mnc="01"/>
 			<network-id mcc="712" mnc="02"/>
-			<apn value="icecelular">
+			<apn value="icecelular" type="internet" plan="postpaid">
 				<username>guest</username>
 				<password>guest</password>
 				<dns>208.133.206.44</dns>
@@ -1352,7 +1352,7 @@ conceived.
 		<name>Comcel</name>
 		<gsm>
 			<network-id mcc="732" mnc="101"/>
-			<apn value="internet.comcel.com.co">
+			<apn value="internet.comcel.com.co" type="internet" plan="postpaid">
 				<username>COMCELWEB</username>
 				<password>COMCELWEB</password>
 			</apn>
@@ -1363,7 +1363,7 @@ conceived.
 		<gsm>
 			<network-id mcc="732" mnc="103"/>
 			<network-id mcc="732" mnc="111"/>
-			<apn value="web.colombiamovil.com.co"/>
+			<apn value="web.colombiamovil.com.co" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -1371,7 +1371,7 @@ conceived.
 		<gsm>
 			<network-id mcc="732" mnc="102"/>
 			<network-id mcc="732" mnc="123"/>
-			<apn value="internet.movistar.com.co">
+			<apn value="internet.movistar.com.co" type="internet" plan="postpaid">
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
@@ -1385,10 +1385,10 @@ conceived.
 		<name>Cytamobile-Vodafone</name>
 		<gsm>
 			<network-id mcc="280" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Contract</name>
 			</apn>
-			<apn value="pp.internet" type="prepaid">
+			<apn value="pp.internet" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -1397,7 +1397,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="280" mnc="10"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -1411,18 +1411,18 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="230" mnc="03"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>O2</name>
 		<gsm>
 			<network-id mcc="230" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>160.218.10.200</dns>
 				<dns>160.218.43.200</dns>
 			</apn>
-			<apn value="internet.open">
+			<apn value="internet.open" type="internet" plan="postpaid">
 				<dns>160.218.10.200</dns>
 				<dns>160.218.43.200</dns>
 			</apn>
@@ -1432,7 +1432,7 @@ conceived.
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="230" mnc="01"/>
-			<apn value="internet.t-mobile.cz">
+			<apn value="internet.t-mobile.cz" type="internet" plan="postpaid">
 				<dns>62.141.0.1</dns>
 				<dns>213.162.65.1</dns>
 			</apn>
@@ -1454,14 +1454,14 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
-			<apn value="internet.eplus.de">
+			<apn value="internet.eplus.de" type="internet" plan="postpaid">
 				<name>Volume rate/30 Day Flatrate</name>
 				<username>eplus</username>
 				<password>gprs</password>
 				<dns>212.23.97.2</dns>
 				<dns>212.23.97.3</dns>
 			</apn>
-			<apn value="tagesflat.eplus.de">
+			<apn value="tagesflat.eplus.de" type="internet" plan="postpaid">
 				<name>24 Hour Flatrate</name>
 				<name xml:lang="de">Tages-Flatrate</name>
 				<username>eplus</username>
@@ -1482,11 +1482,11 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
-			<apn value="internet.eplus.de">
+			<apn value="internet.eplus.de" type="internet" plan="postpaid">
 				<username>blau</username>
 				<password>blau</password>
 			</apn>
-			<apn value="tagesflat.eplus.de">
+			<apn value="tagesflat.eplus.de" type="internet" plan="postpaid">
 				<name>24 Hour Flatrate</name>
 				<name xml:lang="de">Tages-Flatrate</name>
 				<username>blau</username>
@@ -1499,16 +1499,16 @@ conceived.
 		<gsm>
 			<!-- http://www.bildmobil.de/info_handyeinstellungen.html -->
 			<network-id mcc="262" mnc="02"/>
-			<apn value="access.vodafone.de">
+			<apn value="access.vodafone.de" type="internet" plan="postpaid">
 				<name>BILD Mobilportal</name>
 			</apn>
-			<apn value="web.vodafone.de">
+			<apn value="web.vodafone.de" type="internet" plan="postpaid">
 				<name>Contract</name>
 				<dns>139.7.30.125</dns>
 				<dns>139.7.30.126</dns>
 			</apn>
 			<!-- http://www.prepaid-wiki.de/index.php5/BILDmobil_Daten-SIM -->
-			<apn value="event.vodafone.de">
+			<apn value="event.vodafone.de" type="internet" plan="postpaid">
 				<name>BILDmobil Speedstick (Surfpackete)</name>
 			</apn>
 		</gsm>
@@ -1526,7 +1526,7 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
-			<apn value="internet.eplus.de">
+			<apn value="internet.eplus.de" type="internet" plan="postpaid">
 				<username>eplus</username>
 				<password>gprs</password>
 				<dns>212.23.97.2</dns>
@@ -1547,17 +1547,17 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*103*CODE#</ussd>
 			</balance-top-up>
-			<apn value="pinternet.interkom.de">
+			<apn value="pinternet.interkom.de" type="internet" plan="postpaid">
 				<name>LOOP</name>
 				<dns>193.189.244.225</dns>
 				<dns>193.189.244.206</dns>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Pay-by-MB</name>
 				<dns>195.182.110.132</dns>
 				<dns>62.134.11.4</dns>
 			</apn>
-			<apn value="surfo2">
+			<apn value="surfo2" type="internet" plan="postpaid">
 				<name>Pay-by-time</name>
 				<dns>195.182.110.132</dns>
 				<dns>62.134.11.4</dns>
@@ -1577,7 +1577,7 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*103*CODE#</ussd>
 			</balance-top-up>
-			<apn value="webmobil1">
+			<apn value="webmobil1" type="internet" plan="postpaid">
 				<name>Tagesflat / Monats-Flatrate L / Monats-Flatrate XL</name>
 			</apn>
 		</gsm>
@@ -1594,12 +1594,12 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*101*CODE#</ussd>
 			</balance-top-up>
-			<apn value="internet.t-d1.de">
+			<apn value="internet.t-d1.de" type="internet" plan="postpaid">
 				<password>t-d1</password>
 				<dns>193.254.160.1</dns>
 				<dns>193.254.160.130</dns>
 			</apn>
-			<apn value="internet.t-mobile">
+			<apn value="internet.t-mobile" type="internet" plan="postpaid">
 				<username>t-mobile</username>
 				<password>tm</password>
 				<dns>10.74.83.22</dns>
@@ -1612,7 +1612,7 @@ conceived.
 		<gsm>
 			<network-id mcc="262" mnc="01"/>
 
-			<apn value="internet.t-mobile">
+			<apn value="internet.t-mobile" type="internet" plan="postpaid">
 				<username>t-mobile</username>
 				<password>tm</password>
 				<dns>193.254.160.1</dns>
@@ -1633,13 +1633,13 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*100*CODE#</ussd>
 			</balance-top-up>
-			<apn value="web.vodafone.de">
+			<apn value="web.vodafone.de" type="internet" plan="postpaid">
 				<username>vodafone</username>
 				<password>vodafone</password>
 				<dns>139.7.30.125</dns>
 				<dns>139.7.30.126</dns>
 			</apn>
-			<apn value="event.vodafone.de">
+			<apn value="event.vodafone.de" type="internet" plan="postpaid">
 				<name>WebSessions</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
@@ -1660,7 +1660,7 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*103*CODE#</ussd>
 			</balance-top-up>
-			<apn value="pinternet.interkom.de"/>
+			<apn value="pinternet.interkom.de" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -1675,7 +1675,7 @@ conceived.
 			<balance-top-up>
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
-			<apn value="internet.eplus.de">
+			<apn value="internet.eplus.de" type="internet" plan="postpaid">
 				<username>simyo</username>
 				<password>simyo</password>
 				<dns>212.23.97.2</dns>
@@ -1692,7 +1692,7 @@ conceived.
 			<balance-check>
 				<ussd>*100#</ussd>
 			</balance-check>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1705,7 +1705,7 @@ conceived.
 			<balance-check>
 				<ussd>*100#</ussd>
 			</balance-check>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1715,7 +1715,7 @@ conceived.
 		<name>Materna BR</name>
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1725,7 +1725,7 @@ conceived.
 		<name>sdt.net</name>
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1735,7 +1735,7 @@ conceived.
 		<name>igge &amp; ko</name>
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1745,7 +1745,7 @@ conceived.
 		<name>PTT mobile</name>
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1755,7 +1755,7 @@ conceived.
 		<name>TouristMobile</name>
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1768,7 +1768,7 @@ conceived.
 			<balance-check>
 				<ussd>*100#</ussd>
 			</balance-check>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1778,7 +1778,7 @@ conceived.
 		<name>SüdkurierTel</name>
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
-			<apn value="internet.vistream.net">
+			<apn value="internet.vistream.net" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1788,7 +1788,7 @@ conceived.
 		<name>NetCologne</name>
 		<gsm>
 			<network-id mcc="262" mnc="03"/>
-			<apn value="internet.netcologne.de">
+			<apn value="internet.netcologne.de" type="internet" plan="postpaid">
 				<username>web</username>
 				<password>password</password>
 			</apn>
@@ -1798,7 +1798,7 @@ conceived.
 		<name>Alice</name>
 		<gsm>
 			<network-id mcc="262" mnc="07"/>
-			<apn value="internet.partner1">
+			<apn value="internet.partner1" type="internet" plan="postpaid">
 				<name>Option Mobile</name>
 				<dns>193.189.244.225</dns>
 				<dns>193.189.244.206</dns>
@@ -1812,10 +1812,10 @@ conceived.
 			<network-id mcc="262" mnc="02"/>
 			<network-id mcc="262" mnc="04"/>
 			<network-id mcc="262" mnc="09"/>
-			<apn value="web.vodafone.de">
+			<apn value="web.vodafone.de" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
-			<apn value="mail.partner.de">
+			<apn value="mail.partner.de" type="internet" plan="postpaid">
 				<name>Mobile Web</name>
 				<username>D2</username>
 				<password>Web</password>
@@ -1829,7 +1829,7 @@ conceived.
 			<network-id mcc="262" mnc="07"/>
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
-			<apn value="pinternet.interkom.de">
+			<apn value="pinternet.interkom.de" type="internet" plan="postpaid">
 				<!-- Information taken from https://www.netzclub.net/downloads/default/Manuelle_Handyeinstellungen.pdf -->
 				<name>Internet</name>
 			</apn>
@@ -1843,16 +1843,16 @@ conceived.
 		<name>3</name>
 		<gsm>
 			<network-id mcc="238" mnc="06"/>
-			<apn value="bredband.tre.dk">
+			<apn value="bredband.tre.dk" type="internet" plan="postpaid">
 				<name>Bredbånd (standard)</name>
  			</apn>
-			<apn value="net.tre.dk">
+			<apn value="net.tre.dk" type="internet" plan="postpaid">
 				<name>Bredbånd Premium Kontant</name>
 			</apn>
-			<apn value="data.tre.dk">
+			<apn value="data.tre.dk" type="internet" plan="postpaid">
 				<name>3 (standard for mobilkunder; spærret for indgående trafik)</name>
 			</apn>
-			<apn value="static.tre.dk">
+			<apn value="static.tre.dk" type="internet" plan="postpaid">
 				<name>3 (statisk IP)</name>
 			</apn>
 		</gsm>
@@ -1862,7 +1862,7 @@ conceived.
 		<name>OiSTER</name>
 		<gsm>
 			<network-id mcc="238" mnc="06"/>
-			<apn value="bredband.oister.dk"/>
+			<apn value="bredband.oister.dk" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 
@@ -1879,7 +1879,7 @@ conceived.
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
 			<network-id mcc="238" mnc="77"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>212.88.64.199</dns>
 				<dns>212.88.64.14</dns>
 			</apn>
@@ -1892,24 +1892,24 @@ conceived.
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
 			<network-id mcc="238" mnc="77"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>194.239.134.83</dns>
 				<dns>193.162.153.164</dns>
 			</apn>
-			<apn value="internet.no"/>
+			<apn value="internet.no" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Fullrate</name>
 		<gsm>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>Fullrate</username>
 				<password>Fullrate</password>
 			</apn>
@@ -1919,14 +1919,14 @@ conceived.
 		<name>Telia</name>
 		<gsm>
 			<network-id mcc="238" mnc="30"/>
-			<apn value="www.internet.mtelia.dk"/>
+			<apn value="www.internet.mtelia.dk" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>BiBoB</name>
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
-			<apn value="internet.bibob.dk"/>
+			<apn value="internet.bibob.dk" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<!-- Telmore - Same network as TDC -->
@@ -1934,7 +1934,7 @@ conceived.
 		<name>Telmore</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>194.239.134.83</dns>
 				<dns>193.162.153.164</dns>
 			</apn>
@@ -1944,14 +1944,14 @@ conceived.
 		<name>Unotel</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>happiimobil</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -1966,7 +1966,7 @@ conceived.
 			<balance-check>
 				<ussd>#131#</ussd>
 			</balance-check>
-			<apn value="orangenet.com.do"/>
+			<apn value="orangenet.com.do" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -1978,7 +1978,7 @@ conceived.
 				<ussd>*122#</ussd>
 				<dtmf>*22</dtmf>
 			</balance-check>
-			<apn value="internet.ideasclaro.com.do">
+			<apn value="internet.ideasclaro.com.do" type="internet" plan="postpaid">
 				<dns>196.3.81.5</dns>
 				<dns>196.3.81.132</dns>
 			</apn>
@@ -1992,7 +1992,7 @@ conceived.
 				<ussd>#111#</ussd>
 				<dtmf>*74</dtmf>
 			</balance-check>
-			<apn value="edge.viva.net.do">
+			<apn value="edge.viva.net.do" type="internet" plan="postpaid">
 				<username>viva</username>
 				<password>viva</password>
 			</apn>
@@ -2006,14 +2006,14 @@ conceived.
 		<name>Djezzy</name>
 		<gsm>
 			<network-id mcc="603" mnc="02"/>
-			<apn value="djezzy.internet"/>
+			<apn value="djezzy.internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mobilis</name>
 		<gsm>
 			<network-id mcc="603" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -2023,7 +2023,7 @@ conceived.
 		<name>Nedjma</name>
 		<gsm>
 			<network-id mcc="603" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>WEB</name>
 				<username>nedjma</username>
 				<password>nedjma</password>
@@ -2038,7 +2038,7 @@ conceived.
 		<name>Movistar UMTS</name>
 		<gsm>
 			<network-id mcc="740" mnc="00"/>
-			<apn value="navega.movistar.ec">
+			<apn value="navega.movistar.ec" type="internet" plan="postpaid">
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
@@ -2048,7 +2048,7 @@ conceived.
 		<name>Porta 3G</name>
 		<gsm>
 			<network-id mcc="740" mnc="01"/>
-			<apn value="internet.porta.com.ec"/>
+			<apn value="internet.porta.com.ec" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -2059,7 +2059,7 @@ conceived.
 		<name>EMT</name>
 		<gsm>
 			<network-id mcc="248" mnc="01"/>
-			<apn value="internet.emt.ee">
+			<apn value="internet.emt.ee" type="internet" plan="postpaid">
 				<dns>217.71.32.116</dns>
 				<dns>217.71.32.115</dns>
 			</apn>
@@ -2069,14 +2069,14 @@ conceived.
 		<name>Nordea</name>
 		<gsm>
 			<network-id mcc="248" mnc="01"/>
-			<apn value="internet.emt.ee"/>
+			<apn value="internet.emt.ee" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Elisa</name>
 		<gsm>
 			<network-id mcc="248" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>194.204.0.1</dns>
 			</apn>
 		</gsm>
@@ -2085,7 +2085,7 @@ conceived.
 		<name>Tele2</name>
 		<gsm>
 			<network-id mcc="248" mnc="03"/>
-			<apn value="internet.tele2.ee">
+			<apn value="internet.tele2.ee" type="internet" plan="postpaid">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -2099,7 +2099,7 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="602" mnc="02"/>
-			<apn value="internet.vodafone.net">
+			<apn value="internet.vodafone.net" type="internet" plan="postpaid">
 				<username>internet</username>
 				<password>internet</password>
 				<dns>163.121.128.134</dns>
@@ -2111,14 +2111,14 @@ conceived.
 		<name>Etisalat</name>
 		<gsm>
 			<network-id mcc="602" mnc="03"/>
-			<apn value="etisalat"/>
+			<apn value="etisalat" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MobiNil</name>
 		<gsm>
 			<network-id mcc="602" mnc="01"/>
-			<apn value="mobinilweb">
+			<apn value="mobinilweb" type="internet" plan="postpaid">
 				<dns>80.75.166.250</dns>
 				<dns>163.121.163.201</dns>
 			</apn>
@@ -2132,7 +2132,7 @@ conceived.
 		<name>Euskaltel</name>
 		<gsm>
 			<network-id mcc="214" mnc="08"/>
-			<apn value="internet.euskaltel.mobi">
+			<apn value="internet.euskaltel.mobi" type="internet" plan="postpaid">
 				<username>CLIENTE</username>
 				<password>EUSKALTEL</password>
 			</apn>
@@ -2142,21 +2142,21 @@ conceived.
 		<name>Másmovil</name>
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
-			<apn value="internetmas" />
+			<apn value="internetmas" type="internet" plan="postpaid" />
 		</gsm>
 	</provider>
 	<provider>
 		<name>móbil R (Mundo-R)</name>
 		<gsm>
 			<network-id mcc="214" mnc="17"/>
-			<apn value="internet.mundo-r.com" />
+			<apn value="internet.mundo-r.com" type="internet" plan="postpaid" />
 		</gsm>
 	</provider>
 	<provider>
 		<name>moviData</name>
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
-			<apn value="INTERNETTPH">
+			<apn value="INTERNETTPH" type="internet" plan="postpaid">
 				<dns>213.143.33.8</dns>
 				<dns>62.36.225.150</dns>
 			</apn>
@@ -2166,7 +2166,7 @@ conceived.
 		<name>ONO</name>
 		<gsm>
 			<network-id mcc="214" mnc="18"/>
-			<apn value="internet.ono.com">
+			<apn value="internet.ono.com" type="internet" plan="postpaid">
 				<dns>62.42.230.24</dns>
 				<dns>62.42.63.52</dns>
 			</apn>
@@ -2176,7 +2176,7 @@ conceived.
 		<name>Pepephone</name>
 		<gsm>
 			<network-id mcc="214" mnc="06"/>
-			<apn value="gprs.pepephone.com" />
+			<apn value="gprs.pepephone.com" type="internet" plan="postpaid" />
 		</gsm>
 	</provider>
 	<provider>
@@ -2184,7 +2184,7 @@ conceived.
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
 			<network-id mcc="214" mnc="09"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Orange</name>
 				<username>ORANGE</username>
 				<password>ORANGE</password>
@@ -2197,7 +2197,7 @@ conceived.
 		<name>Simyo/Blau</name>
 		<gsm>
 			<network-id mcc="214" mnc="19"/>
-			<apn value="gprs-service.com">
+			<apn value="gprs-service.com" type="internet" plan="postpaid">
 				<dns>195.230.105.134</dns>
 				<dns>195.230.105.135</dns>
 			</apn>
@@ -2207,7 +2207,7 @@ conceived.
 		<name>Telecable</name>
 		<gsm>
 			<network-id mcc="214" mnc="16"/>
-			<apn value="internet.telecable.es">
+			<apn value="internet.telecable.es" type="internet" plan="postpaid">
 				<username>telecable</username>
 				<password>telecable</password>
 			</apn>
@@ -2218,7 +2218,7 @@ conceived.
 		<gsm>
 			<network-id mcc="214" mnc="05"/>
 			<network-id mcc="214" mnc="07"/>
-			<apn value="movistar.es">
+			<apn value="movistar.es" type="internet" plan="postpaid">
 				<username>movistar</username>
 				<password>movistar</password>
 				<dns>194.179.1.100</dns>
@@ -2231,14 +2231,14 @@ conceived.
 		<gsm>
 			<network-id mcc="214" mnc="01"/>
 			<network-id mcc="214" mnc="06"/>
-			<apn value="airtelnet.es">
+			<apn value="airtelnet.es" type="internet" plan="postpaid">
 				<name>Airtel (old)</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 				<dns>212.73.32.3</dns>
 				<dns>212.73.32.67</dns>
 			</apn>
-			<apn value="ac.vodafone.es">
+			<apn value="ac.vodafone.es" type="internet" plan="postpaid">
 				<name>Vodafone</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
@@ -2251,7 +2251,7 @@ conceived.
 		<name>Yoigo</name>
 		<gsm>
 			<network-id mcc="214" mnc="04"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>213.248.76.210</dns>
 				<dns>213.248.100.54</dns>
 			</apn>
@@ -2261,7 +2261,7 @@ conceived.
 		<name>Jazztel</name>
 		<gsm>
 			<network-id mcc="214" mnc="21"/>
-			<apn value="jazzinternet">
+			<apn value="jazzinternet" type="internet" plan="postpaid">
 				<dns>87.216.1.65</dns>
 				<dns>87.216.1.66</dns>
 			</apn>
@@ -2270,7 +2270,7 @@ conceived.
 	<provider>
 		<name>Carrefour Móvil</name>
 		<gsm>
-			<apn value="CARREFOURINTERNET"/>
+			<apn value="CARREFOURINTERNET" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -2281,7 +2281,7 @@ conceived.
 		<name>Vodafone FO</name>
 		<gsm>
 			<network-id mcc="288" mnc="02"/>
-			<apn value="vmc.vodafone.fo"/>
+			<apn value="vmc.vodafone.fo" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -2292,7 +2292,7 @@ conceived.
 		<name>Dna</name>
 		<gsm>
 			<network-id mcc="244" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>217.78.192.22</dns>
 				<dns>217.78.192.78</dns>
 			</apn>
@@ -2302,19 +2302,19 @@ conceived.
 		<name>Elisa</name>
 		<gsm>
 			<network-id mcc="244" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Saunalahti</name>
 		<gsm>
 			<network-id mcc="244" mnc="21"/>
-			<apn value="internet.saunalahti">
+			<apn value="internet.saunalahti" type="internet" plan="postpaid">
 				<name>Postpaid (contract)</name>
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
 			</apn>
-			<apn value="internet" type="prepaid">
+			<apn value="internet" type="internet" plan="prepaid">
 				<name>Prepaid (no contract)</name>
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
@@ -2325,11 +2325,11 @@ conceived.
 		<name>Sonera</name>
 		<gsm>
 			<network-id mcc="244" mnc="91"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
 			</apn>
-			<apn value="prointernet">
+			<apn value="prointernet" type="internet" plan="postpaid">
 				<name>Prointernet (public IP)</name>
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
@@ -2339,7 +2339,7 @@ conceived.
 	<provider>
 		<name>Welho</name>
 		<gsm>
-			<apn value="internet.welho.fi">
+			<apn value="internet.welho.fi" type="internet" plan="postpaid">
 				<name>Wekkula</name>
 			</apn>
 		</gsm>
@@ -2352,8 +2352,8 @@ conceived.
 		<name>Vodafone / Kidanet</name>
 		<gsm>
 			<network-id mcc="542" mnc="01"/>
-			<apn value="vfinternet.fj"/>
-			<apn value="kidanet.fj"/>
+			<apn value="vfinternet.fj" type="internet" plan="postpaid"/>
+			<apn value="kidanet.fj" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -2363,7 +2363,7 @@ conceived.
 	<provider>
 		<name>A Mobile (Auchan Telecom)</name>
 		<gsm>
-			<apn value="wap65"/>
+			<apn value="wap65" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -2371,23 +2371,23 @@ conceived.
 		<gsm>
 			<network-id mcc="208" mnc="20"/>
 			<network-id mcc="208" mnc="21"/>
-			<apn value="a2bouygtel.com">
+			<apn value="a2bouygtel.com" type="internet" plan="postpaid">
 				<name>Contrat Pro Data Illimité</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="b2bouygtel.com">
+			<apn value="b2bouygtel.com" type="internet" plan="postpaid">
 				<name>B2Bouygtel</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="ebouygtel.com">
+			<apn value="ebouygtel.com" type="internet" plan="postpaid">
 				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="mmsbouygtel.com">
+			<apn value="mmsbouygtel.com" type="internet" plan="postpaid">
 				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="pcebouygtel.com">
+			<apn value="pcebouygtel.com" type="internet" plan="postpaid">
 				<name>Contrat Pro Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
@@ -2398,35 +2398,35 @@ conceived.
 		<gsm>
 			<network-id mcc="208" mnc="01"/>
 			<network-id mcc="208" mnc="00"/>
-			<apn value="orange.fr">
+			<apn value="orange.fr" type="internet" plan="postpaid">
 				<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">
+			<apn value="internet-entreprise" type="internet" plan="postpaid">
 				<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">
+			<apn value="orange" type="internet" plan="postpaid">
 				<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">
+			<apn value="orange-mib" type="internet" plan="postpaid">
 				<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">
+			<apn value="orange.ie" type="internet" plan="postpaid">
 				<name>Internet Everywhere 3G</name>
 			</apn>
 		</gsm>
@@ -2437,22 +2437,22 @@ conceived.
 			<!-- http://assistance.sfr.fr/internet-partout/Mobile/difference-wap-web/fc-2302-62196 -->
 			<network-id mcc="208" mnc="10"/>
 			<network-id mcc="208" mnc="11"/>
-			<apn value="websfr">
+			<apn value="websfr" type="internet" plan="postpaid">
 				<name>Web / Prepaid</name>
 			</apn>
-			<apn value="wapsfr" type="wap">
+			<apn value="wapsfr" type="wap" plan="postpaid">
 				<name>WAP</name>
 			</apn>
-			<apn value="internetpro">
+			<apn value="internetpro" type="internet" plan="postpaid">
 				<name>SFR internetpro</name>
 			</apn>
-			<apn value="ipnet">
+			<apn value="ipnet" type="internet" plan="postpaid">
 				<name>SFR ipnet</name>
 			</apn>
-			<apn value="slsfr">
+			<apn value="slsfr" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
-			<apn value="sl2sfr">
+			<apn value="sl2sfr" type="internet" plan="postpaid">
 				<name>Full Internet (Webphone)</name>
 			</apn>
 		</gsm>
@@ -2461,18 +2461,18 @@ conceived.
 		<name>Transatel Telecom</name>
 		<gsm>
 			<network-id mcc="208" mnc="22"/>
-			<apn value="netgprs.com"/>
+			<apn value="netgprs.com" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TEN</name>
 		<gsm>
 			<network-id mcc="208" mnc="01"/>
-			<apn value="ao.fr">
+			<apn value="ao.fr" type="internet" plan="postpaid">
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
-			<apn value="ofnew.fr">
+			<apn value="ofnew.fr" type="internet" plan="postpaid">
 				<name>Pay-by-MB</name>
 				<username>orange</username>
 				<password>orange</password>
@@ -2487,14 +2487,14 @@ conceived.
 		<name>airtel vodaphone</name>
 		<gsm>
 			<network-id mcc="234" mnc="03"/>
-			<apn value="airtel-ci-gprs.com"/>
+			<apn value="airtel-ci-gprs.com" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>BT Mobile</name>
 		<gsm>
 			<network-id mcc="234" mnc="00"/>
-			<apn value="btmobile.bt.com">
+			<apn value="btmobile.bt.com" type="internet" plan="postpaid">
 				<username>bt</username>
 				<password>bt</password>
 			</apn>
@@ -2511,38 +2511,38 @@ conceived.
 				<ussd>*#10#</ussd>
 				<dtmf>4444</dtmf>
 			</balance-check>
-			<apn value="mobile.o2.co.uk">
+			<apn value="mobile.o2.co.uk" type="internet" plan="postpaid">
 				<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">
+			<apn value="mobile.o2.co.uk" type="internet" plan="postpaid">
 				<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" type="prepaid">
+			<apn value="payandgo.o2.co.uk" type="internet" plan="prepaid">
 				<name>Pay and Go (Prepaid)</name>
 				<username>payandgo</username>
 				<password>payandgo</password>
 			</apn>
-			<apn value="idata.o2.co.uk">
+			<apn value="idata.o2.co.uk" type="internet" plan="postpaid">
 				<name>iPhone (Contract)</name>
 				<username>vertigo</username>
 				<password>password</password>
 			</apn>
-			<apn value="m-bb.o2.co.uk">
+			<apn value="m-bb.o2.co.uk" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 				<username>o2bb</username>
 				<password>password</password>
 				<dns>82.132.254.2</dns>
 				<dns>82.132.254.3</dns>
 			</apn>
-			<apn value="wap.o2.co.uk" type="wap">
+			<apn value="wap.o2.co.uk" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>o2wap</username>
 				<password>password</password>
@@ -2559,13 +2559,13 @@ conceived.
 				<sms text="BA">150</sms>
 				<sms text="AL">150</sms>
 			</balance-check>
-			<apn value="general.t-mobile.uk">
+			<apn value="general.t-mobile.uk" type="internet" plan="postpaid">
 				<username>User</username>
 				<password>mms</password>
 				<dns>149.254.201.126</dns>
 				<dns>149.254.192.126</dns>
 			</apn>
-			<apn value="general.t-mobile.uk">
+			<apn value="general.t-mobile.uk" type="internet" plan="postpaid">
 				<dns>149.254.230.7</dns>
 				<dns>149.254.199.126</dns>
 			</apn>
@@ -2576,7 +2576,7 @@ conceived.
 		<gsm>
 			<network-id mcc="234" mnc="31"/>
 			<network-id mcc="234" mnc="32"/>
-			<apn value="vdata">
+			<apn value="vdata" type="internet" plan="postpaid">
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -2591,26 +2591,26 @@ conceived.
 				<ussd>*#1345#</ussd>
 				<dtmf>2345</dtmf>
 			</balance-check>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<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" type="prepaid">
+			<apn value="pp.vodafone.co.uk" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<username>wap</username>
 				<password>wap</password>
 				<dns>172.29.1.11</dns>
 				<dns>172.29.1.11</dns>
 			</apn>
-			<apn value="ppbundle.internet">
+			<apn value="ppbundle.internet" type="internet" plan="postpaid">
 				<name>TopUp and Go</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="pp.internet">
+			<apn value="pp.internet" type="internet" plan="postpaid">
 				<name>TopUp and Go (older SIMs)</name>
 			</apn>
 		</gsm>
@@ -2619,10 +2619,10 @@ conceived.
 		<name>3</name>
 		<gsm>
 			<network-id mcc="234" mnc="20"/>
-			<apn value="3internet">
+			<apn value="3internet" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
-			<apn value="three.co.uk">
+			<apn value="three.co.uk" type="internet" plan="postpaid">
 				<name>Handsets</name>
 				<dns>172.30.139.17</dns>
 				<dns>172.30.140.69</dns>
-- 
1.7.1



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