[PATCH 2/2] all: re-tag APNs according to the new dtd (type, plan)



---
 serviceproviders.xml | 1456 +++++++++++++++++++++++++-------------------------
 1 files changed, 728 insertions(+), 728 deletions(-)

diff --git a/serviceproviders.xml b/serviceproviders.xml
index a5e82fb..5522738 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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract">
 				<name>TWA</name>
 			</apn>
-			<apn value="vodafoneweb">
+			<apn value="vodafoneweb" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<name>Internet Hima (USB)</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<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="contract">
 				<name>MTS connect</name>
 			</apn>
-			<apn value="inet.vivacell.am">
+			<apn value="inet.vivacell.am" type="internet" plan="contract">
 				<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="contract" />
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>WAP</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 			</apn>
-			<apn value="gprsinternet">
+			<apn value="gprsinternet" type="internet" plan="contract">
 				<name>Internet</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 			</apn>
-			<apn value="business.gprsinternet">
+			<apn value="business.gprsinternet" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>Web (no filtering)</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="orange.web">
+			<apn value="orange.web" type="internet" plan="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</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="contract"/>
 		</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="contract">
 				<name>NodeMobile Data</name>
 			</apn>
-			<apn value="splns333a1">
+			<apn value="splns333a1" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
 			</apn>
-			<apn value="telstra.datapack">
+			<apn value="telstra.datapack" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Bakcell</name>
 		<gsm>
 			<network-id mcc="400" mnc="02"/>
-			<apn value="mms"/>
+			<apn value="mms" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Azerfon</name>
 		<gsm>
 			<network-id mcc="400" mnc="04"/>
-			<apn value="azerfon"/>
+			<apn value="azerfon" type="internet" plan="contract"/>
 		</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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -494,27 +494,27 @@ conceived.
 			<balance-check>
 				<ussd>*101#</ussd>
 			</balance-check>
-			<apn value="mtelgprs1">
+			<apn value="mtelgprs1" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>Walk &amp; Talk</name>
 			</apn>
-			<apn value="telenetwap.be">
+			<apn value="telenetwap.be" type="internet" plan="contract">
 				<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="contract"/>
 		</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="contract">
 				<name>Inter</name>
 			</apn>
-			<apn value="intraprox.be">
+			<apn value="intraprox.be" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<!-- 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="contract">
 				<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="contract">
 				<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="contract">
 				<name>Internet</name>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
-			<apn value="hsdpa">
+			<apn value="hsdpa" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<username>claro</username>
 				<password>claro</password>
 			</apn>
-			<apn value="bandalarga.claro.com.br">
+			<apn value="bandalarga.claro.com.br" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<password>oioioi</password>
 			</apn>
-			<apn value="wapgprs.oi.com.br" type="wap">
+			<apn value="wapgprs.oi.com.br" type="wap" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>DSTCOM</name>
 		<gsm>
 			<network-id mcc="528" mnc="11"/>
-			<apn value="dst.wap">
+			<apn value="dst.wap" type="internet" plan="contract">
 				<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="contract">
 				<name>GPRS WAP</name>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
-			<apn value="web.velcom.by">
+			<apn value="web.velcom.by" type="internet" plan="contract">
 				<name>GPRS WEB</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="plus.velcom.by">
+			<apn value="plus.velcom.by" type="internet" plan="contract">
 				<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="contract">
 				<name>GPRS PRIVET</name>
 				<username>privet</username>
 				<password>privet</password>
 			</apn>
-			<apn value="web1.velcom.by">
+			<apn value="web1.velcom.by" type="internet" plan="contract">
 				<name>WEB BASIC</name>
 				<username>web1</username>
 				<password>web1</password>
 			</apn>
-			<apn value="web2.velcom.by">
+			<apn value="web2.velcom.by" type="internet" plan="contract">
 				<name>WEB 25</name>
 				<username>web2</username>
 				<password>web2</password>
 			</apn>
-			<apn value="web3.velcom.by">
+			<apn value="web3.velcom.by" type="internet" plan="contract">
 				<name>WEB 150</name>
 				<username>web3</username>
 				<password>web3</password>
 			</apn>
-			<apn value="vmi.velcom.by">
+			<apn value="vmi.velcom.by" type="internet" plan="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tempo/Africell</name>
 		<gsm>
 			<network-id mcc="642" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<name>Internet</name>
 			</apn>
-			<apn value="pda.bell.ca">
+			<apn value="pda.bell.ca" type="internet" plan="contract">
 				<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="contract">
 				<name>Internet</name>
 			</apn>
-			<apn value="vpn.telus.com">
+			<apn value="vpn.telus.com" type="internet" plan="contract">
 				<name>Internet (with VPN)</name>
 			</apn>
-			<apn value="bb.telus.com">
+			<apn value="bb.telus.com" type="internet" plan="contract">
 				<name>Blackberry</name>
 			</apn>
-			<apn value="sp.telus.com">
+			<apn value="sp.telus.com" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<name>Laptop (data stick)</name>
 			</apn>
-			<apn value="internet.windmobile.ca">
+			<apn value="internet.windmobile.ca" type="internet" plan="contract">
 				<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="contract">
 				<name>Mobile Web</name>
 			</apn>
-			<apn value="internet.davewireless.com">
+			<apn value="internet.davewireless.com" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>WAP</name>
 				<username>guest</username>
 				<password>guest</password>
 			</apn>
-			<apn value="cmnet">
+			<apn value="cmnet" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>O2</name>
 		<gsm>
 			<network-id mcc="230" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>160.218.10.200</dns>
 				<dns>160.218.43.200</dns>
 			</apn>
-			<apn value="internet.open">
+			<apn value="internet.open" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<username>blau</username>
 				<password>blau</password>
 			</apn>
-			<apn value="tagesflat.eplus.de">
+			<apn value="tagesflat.eplus.de" type="internet" plan="contract">
 				<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="contract">
 				<name>BILD Mobilportal</name>
 			</apn>
-			<apn value="web.vodafone.de">
+			<apn value="web.vodafone.de" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>Mobile Broadband</name>
 			</apn>
-			<apn value="mail.partner.de">
+			<apn value="mail.partner.de" type="internet" plan="contract">
 				<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="contract">
 				<!-- 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="contract">
 				<name>Bredbånd (standard)</name>
  			</apn>
-			<apn value="net.tre.dk">
+			<apn value="net.tre.dk" type="internet" plan="contract">
 				<name>Bredbånd Premium Kontant</name>
 			</apn>
-			<apn value="data.tre.dk">
+			<apn value="data.tre.dk" type="internet" plan="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>194.239.134.83</dns>
 				<dns>193.162.153.164</dns>
 			</apn>
-			<apn value="internet.no"/>
+			<apn value="internet.no" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Fullrate</name>
 		<gsm>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>happiimobil</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</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="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mobilis</name>
 		<gsm>
 			<network-id mcc="603" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Elisa</name>
 		<gsm>
 			<network-id mcc="248" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MobiNil</name>
 		<gsm>
 			<network-id mcc="602" mnc="01"/>
-			<apn value="mobinilweb">
+			<apn value="mobinilweb" type="internet" plan="contract">
 				<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="contract">
 				<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="contract" />
 		</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="contract" />
 		</gsm>
 	</provider>
 	<provider>
 		<name>moviData</name>
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
-			<apn value="INTERNETTPH">
+			<apn value="INTERNETTPH" type="internet" plan="contract">
 				<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="contract">
 				<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="contract" />
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract"/>
 		</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="contract"/>
 		</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="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Saunalahti</name>
 		<gsm>
 			<network-id mcc="244" mnc="21"/>
-			<apn value="internet.saunalahti">
+			<apn value="internet.saunalahti" type="internet" plan="contract">
 				<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="contract">
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
 			</apn>
-			<apn value="prointernet">
+			<apn value="prointernet" type="internet" plan="contract">
 				<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="contract">
 				<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="contract"/>
+			<apn value="kidanet.fj" type="internet" plan="contract"/>
 		</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="contract"/>
 		</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="contract">
 				<name>Contrat Pro Data Illimité</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="b2bouygtel.com">
+			<apn value="b2bouygtel.com" type="internet" plan="contract">
 				<name>B2Bouygtel</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="ebouygtel.com">
+			<apn value="ebouygtel.com" type="internet" plan="contract">
 				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="mmsbouygtel.com">
+			<apn value="mmsbouygtel.com" type="internet" plan="contract">
 				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-			<apn value="pcebouygtel.com">
+			<apn value="pcebouygtel.com" type="internet" plan="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>Web / Prepaid</name>
 			</apn>
-			<apn value="wapsfr" type="wap">
+			<apn value="wapsfr" type="wap" plan="contract">
 				<name>WAP</name>
 			</apn>
-			<apn value="internetpro">
+			<apn value="internetpro" type="internet" plan="contract">
 				<name>SFR internetpro</name>
 			</apn>
-			<apn value="ipnet">
+			<apn value="ipnet" type="internet" plan="contract">
 				<name>SFR ipnet</name>
 			</apn>
-			<apn value="slsfr">
+			<apn value="slsfr" type="internet" plan="contract">
 				<name>Mobile Broadband</name>
 			</apn>
-			<apn value="sl2sfr">
+			<apn value="sl2sfr" type="internet" plan="contract">
 				<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="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TEN</name>
 		<gsm>
 			<network-id mcc="208" mnc="01"/>
-			<apn value="ao.fr">
+			<apn value="ao.fr" type="internet" plan="contract">
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
-			<apn value="ofnew.fr">
+			<apn value="ofnew.fr" type="internet" plan="contract">
 				<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="contract"/>
 		</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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<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="contract">
 				<name>TopUp and Go</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="pp.internet">
+			<apn value="pp.internet" type="internet" plan="contract">
 				<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="contract">
 				<name>Internet</name>
 			</apn>
-			<apn value="three.co.uk">
+			<apn value="three.co.uk" type="internet" plan="contract">
 				<name>Handsets</name>
 				<dns>172.30.139.17</dns>
 				<dns>172.30.140.69</dns>
@@ -2638,21 +2638,21 @@ conceived.
 			<balance-check>
 				<dtmf>453</dtmf>
 			</balance-check>
-			<apn value="orangeinternet">
+			<apn value="orangeinternet" type="internet" plan="contract">
 				<name>Contract</name>
 				<username>orange</username>
 				<password>orange</password>
 				<dns>193.35.133.10</dns>
 				<dns>193.35.134.10</dns>
 			</apn>
-			<apn value="internetvpn">
+			<apn value="internetvpn" type="internet" plan="contract">
 				<name>Contract (with VPN)</name>
 				<username>orange</username>
 				<password>orange</password>
 				<dns>193.35.133.10</dns>
 				<dns>193.35.134.10</dns>
 			</apn>
-			<apn value="orangewap" type="wap">
+			<apn value="orangewap" type="wap" plan="contract">
 				<name>Orange WAP</name>
 				<username>orange</username>
 				<password>multimedia</password>
@@ -2669,7 +2669,7 @@ conceived.
 		<name>Geocell</name>
 		<gsm>
 			<network-id mcc="282" mnc="01"/>
-			<apn value="Internet">
+			<apn value="Internet" type="internet" plan="contract">
 				<dns>212.72.130.20</dns>
 				<dns>212.72.152.001</dns>
 			</apn>
@@ -2683,10 +2683,10 @@ conceived.
 		<name>Sure (Cable &amp; Wireless)</name>
 		<gsm>
 			<network-id mcc="234" mnc="55"/>
-			<apn value="wap" type="wap">
+			<apn value="wap" type="wap" plan="contract">
 				<name>WAP</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -2699,21 +2699,21 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="620" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone (ONEtouch)</name>
 		<gsm>
 			<network-id mcc="620" mnc="02"/>
-			<apn value="browse"/>
+			<apn value="browse" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="620" mnc="03"/>
-			<apn value="web.tigo.com.gh">
+			<apn value="web.tigo.com.gh" type="internet" plan="contract">
 				<username>web</username>
 			</apn>
 		</gsm>
@@ -2722,7 +2722,7 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="620" mnc="06"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -2737,17 +2737,17 @@ conceived.
 		<name>Cosmote</name>
 		<gsm>
 			<network-id mcc="202" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="202" mnc="05"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Contract</name>
 			</apn>
-			<apn value="web.session">
+			<apn value="web.session" type="internet" plan="contract">
 				<name>Mobile Broadband On Demand</name>
 			</apn>
 		</gsm>
@@ -2757,7 +2757,7 @@ conceived.
 		<gsm>
 			<network-id mcc="202" mnc="09"/>
 			<network-id mcc="202" mnc="10"/>
-			<apn value="gint.b-online.gr">
+			<apn value="gint.b-online.gr" type="internet" plan="contract">
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -2771,14 +2771,14 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="704" mnc="01"/>
-			<apn value="internet.ideasclaro"/>
+			<apn value="internet.ideasclaro" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Comcel / Tigo</name>
 		<gsm>
 			<network-id mcc="704" mnc="02"/>
-			<apn value="Wap.tigo.gt">
+			<apn value="Wap.tigo.gt" type="internet" plan="contract">
 				<username>Wap</username>
 				<password>Wap</password>
 			</apn>
@@ -2792,7 +2792,7 @@ conceived.
 		<name>GT&amp;T Cellink Plus</name>
 		<gsm>
 			<network-id mcc="738" mnc="02"/>
-			<apn value="wap.cellinkgy.com">
+			<apn value="wap.cellinkgy.com" type="internet" plan="contract">
 				<username>test</username>
 				<password>test</password>
 			</apn>
@@ -2802,7 +2802,7 @@ conceived.
 		<name>DigiCel</name>
 		<gsm>
 			<network-id mcc="738" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -2817,7 +2817,7 @@ conceived.
 		<gsm>
 			<network-id mcc="454" mnc="00"/>
 			<network-id mcc="454" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>202.84.255.1</dns>
 				<dns>203.116.254.150</dns>
 			</apn>
@@ -2827,21 +2827,21 @@ conceived.
 		<name>New World</name>
 		<gsm>
 			<network-id mcc="454" mnc="10"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>China Mobile</name>
 		<gsm>
 			<network-id mcc="454" mnc="12"/>
-			<apn value="peoples.net"/>
+			<apn value="peoples.net" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SmarTone</name>
 		<gsm>
 			<network-id mcc="454" mnc="06"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -2849,13 +2849,13 @@ conceived.
 		<gsm>
 			<network-id mcc="454" mnc="16"/>
 			<network-id mcc="454" mnc="19"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Sunday (Old)</name>
 			</apn>
-			<apn value="pccwdata">
+			<apn value="pccwdata" type="internet" plan="contract">
 				<name>PCCW 2G/GPRS</name>
 			</apn>
-			<apn value="pccw">
+			<apn value="pccw" type="internet" plan="contract">
 				<name>PCCW 3G</name>
 			</apn>
 		</gsm>
@@ -2865,7 +2865,7 @@ conceived.
 		<gsm>
 			<network-id mcc="454" mnc="03"/>
 			<network-id mcc="454" mnc="04"/>
-			<apn value="mobile.three.com.hk"/>
+			<apn value="mobile.three.com.hk" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -2876,7 +2876,7 @@ conceived.
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="708" mnc="02"/>
-			<apn value="internet.tigo.hn"/>
+			<apn value="internet.tigo.hn" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -2887,7 +2887,7 @@ conceived.
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="219" mnc="01"/>
-			<apn value="web.htgprs">
+			<apn value="web.htgprs" type="internet" plan="contract">
 				<dns>10.12.0.1</dns>
 			</apn>
 		</gsm>
@@ -2896,22 +2896,22 @@ conceived.
 		<name>VIPNET</name>
 		<gsm>
 			<network-id mcc="219" mnc="10"/>
-			<apn value="data.vip.hr">
+			<apn value="data.vip.hr" type="internet" plan="contract">
 				<name>Contract and Prepaid</name>
 			</apn>
-			<apn value="gprs5.vipnet.hr">
+			<apn value="gprs5.vipnet.hr" type="internet" plan="contract">
 				<name>GPRS 5</name>
 				<username>38591</username>
 				<password>38591</password>
 				<dns>195.29.159.15</dns>
 			</apn>
-			<apn value="gprs0.vipnet.hr">
+			<apn value="gprs0.vipnet.hr" type="internet" plan="contract">
 				<name>GPRS 0</name>
 				<username>38591</username>
 				<password>38591</password>
 				<dns>195.29.159.15</dns>
 			</apn>
-			<apn value="3g.vip.hr">
+			<apn value="3g.vip.hr" type="internet" plan="contract">
 				<name>3G</name>
 				<username>38591</username>
 				<password>38591</password>
@@ -2924,7 +2924,7 @@ conceived.
 		<name>CARNet VIPNET</name>
 		<gsm>
 			<network-id mcc="219" mnc="10"/>
-			<apn value="carnet.vip.hr">
+			<apn value="carnet.vip.hr" type="internet" plan="contract">
 				<username>AAIEDU</username>
 				<password></password>
 			</apn>
@@ -2934,7 +2934,7 @@ conceived.
 		<name>CARNet Tele2</name>
 		<gsm>
 			<network-id mcc="219" mnc="02"/>
-			<apn value="carnet.tele2.hr">
+			<apn value="carnet.tele2.hr" type="internet" plan="contract">
 				<username>AAIEDU</username>
 				<password></password>
 			</apn>
@@ -2944,7 +2944,7 @@ conceived.
 		<name>Tele2</name>
 		<gsm>
 			<network-id mcc="219" mnc="02"/>
-			<apn value="mobileinternet.tele2.hr">
+			<apn value="mobileinternet.tele2.hr" type="internet" plan="contract">
 				<dns>212.247.156.66</dns>
 			</apn>
 		</gsm>
@@ -2957,7 +2957,7 @@ conceived.
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="216" mnc="01"/>
-			<apn value="net">
+			<apn value="net" type="internet" plan="contract">
 				<name>mobilinternet</name>
 				<dns>217.79.128.40</dns>
 				<dns>217.79.128.45</dns>
@@ -2968,11 +2968,11 @@ conceived.
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="216" mnc="30"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>212.51.115.1</dns>
 				<dns>194.176.224.6</dns>
 			</apn>
-			<apn value="mms-westel" type="mms">
+			<apn value="mms-westel" type="mms" plan="contract">
 				<name>MMS</name>
 				<username>mms</username>
 				<dns>212.51.115.1</dns>
@@ -2984,7 +2984,7 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="216" mnc="70"/>
-			<apn value="standardnet.vodafone.net">
+			<apn value="standardnet.vodafone.net" type="internet" plan="contract">
 				<name>ElÅ?f. Normál</name>
 				<username>vodawap</username>
 				<password>vodawap</password>
@@ -2992,17 +2992,17 @@ conceived.
 				<dns>80.244.96.1</dns>
 			</apn>
 			<!-- http://www.vodafone.hu/en/support/questions-answers/pay-monthly/internet -->
-			<apn value="internet.vodafone.net">
+			<apn value="internet.vodafone.net" type="internet" plan="contract">
 				<name>ElÅ?f. töm.</name>
 				<username>vodawap</username>
 				<password>vodawap</password>
 			</apn>
-			<apn value="vitamax.snet.vodafone.net">
+			<apn value="vitamax.snet.vodafone.net" type="internet" plan="contract">
 				<name>Felt. norm.</name>
 				<dns>80.244.97.30</dns>
 				<dns>80.244.96.1</dns>
 			</apn>
-			<apn value="vitamax.internet.vodafone.net">
+			<apn value="vitamax.internet.vodafone.net" type="internet" plan="contract">
 				<name>Vodafone (felt. töm.)</name>
 			</apn>
 		</gsm>
@@ -3011,7 +3011,7 @@ conceived.
 		<name>Invitel</name>
                 <!-- MVNO operating on Telenor's network -->
 		<gsm>
-			<apn value="invitel.mobilnet">
+			<apn value="invitel.mobilnet" type="internet" plan="contract">
 				<name>net.and.go</name>
 			</apn>
 		</gsm>
@@ -3024,12 +3024,12 @@ conceived.
 		<name>3</name>
 		<gsm>
 			<network-id mcc="510" mnc="89"/>
-			<apn value="3gprs">
+			<apn value="3gprs" type="internet" plan="contract">
 				<name>GPRS</name>
 				<username>3gprs</username>
 				<password>3gprs</password>
 			</apn>
-			<apn value="3data">
+			<apn value="3data" type="internet" plan="contract">
 				<name>Monthly Internet Service</name>
 				<name xml:lang="id">Layanan Internet Bulanan</name>
 				<username>3data</username>
@@ -3041,7 +3041,7 @@ conceived.
 		<name>AXIS</name>
 		<gsm>
 			<network-id mcc="510" mnc="08"/>
-			<apn value="AXIS">
+			<apn value="AXIS" type="internet" plan="contract">
 				<username>axis</username>
 				<password>123456</password>
 			</apn>
@@ -3058,17 +3058,17 @@ conceived.
 			<!-- http://www.indosat.com/Mentari/Mentari_Update/Voucher_Internet_Indosat -->
 			<!-- It seems that the APN is pretty much the same for plans -->
 
-			<apn value="indosatgprs">
+			<apn value="indosatgprs" type="internet" plan="contract">
 				<name>IM3/Mentari Time-based</name>
 				<username>indosat@durasi</username>
 				<password>indosat@durasi</password>
 			</apn>
-			<apn value="indosatgprs">
+			<apn value="indosatgprs" type="internet" plan="contract">
 				<name>IM3/Mentari Volume-based</name>
 				<username>indosat</username>
 				<password>indosat</password>
 			</apn>
-			<apn value="indosatgprs">
+			<apn value="indosatgprs" type="internet" plan="contract">
 				<name>Matrix 3G/3.5G</name>
 				<username>indosat</username>
 				<password>indosat</password>
@@ -3089,7 +3089,7 @@ conceived.
 			<network-id mcc="510" mnc="20"/>
 
 			<!-- http://www.telkomsel.com/customer-service/manual-setting/ -->
-			<apn value="telkomsel">
+			<apn value="telkomsel" type="internet" plan="contract">
 				<username>wap</username>
 				<password>wap123</password>
 				<dns>202.152.0.2</dns>
@@ -3097,12 +3097,12 @@ conceived.
 			</apn>
 
 			<!-- http://www.telkomsel.com/telkomselflash/telkomsel-flash -->
-			<apn value="flash">
+			<apn value="flash" type="internet" plan="contract">
 				<name>Flash Time-based</name>
 				<username>foo</username>
 				<password>bar</password>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Flash Volume-based</name>
 				<username>foo</username>
 				<password>bar</password>
@@ -3113,7 +3113,7 @@ conceived.
 		<name>Excelcomindo (XL)</name>
 		<gsm>
 			<network-id mcc="510" mnc="11"/>
-			<apn value="www.xlgprs.net">
+			<apn value="www.xlgprs.net" type="internet" plan="contract">
 				<username>xlgprs</username>
 				<password>proxl</password>
 				<dns>202.152.254.245</dns>
@@ -3169,14 +3169,14 @@ conceived.
 			<balance-check>
 				<ussd>*#100#</ussd>
 			</balance-check>
-			<apn value="open.internet">
+			<apn value="open.internet" type="internet" plan="contract">
 				<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" type="prepaid">
+			<apn value="pp.internet" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<username>faster</username>
 				<password>web</password>
@@ -3189,16 +3189,16 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="272" mnc="01"/>
-			<apn value="hs.vodafone.ie">
+			<apn value="hs.vodafone.ie" type="internet" plan="contract">
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="isp.vodafone.ie">
+			<apn value="isp.vodafone.ie" type="internet" plan="contract">
 				<name>Old</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="live.vodafone.com" type="prepaid">
+			<apn value="live.vodafone.com" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
@@ -3210,12 +3210,12 @@ conceived.
 		<name>Meteor</name>
 		<gsm>
 			<network-id mcc="272" mnc="03"/>
-			<apn value="data.mymeteor.ie">
+			<apn value="data.mymeteor.ie" type="internet" plan="contract">
 				<name>Meteor Data</name>
 				<username>my</username>
 				<password>meteor</password>
 			</apn>
-			<apn value="broadband.mymeteor.ie">
+			<apn value="broadband.mymeteor.ie" type="internet" plan="contract">
 				<name>Broadband To Go</name>
 			</apn>
 		</gsm>
@@ -3224,7 +3224,7 @@ conceived.
 		<name>Three Ireland</name>
 		<gsm>
 			<network-id mcc="272" mnc="05"/>
-			<apn value="3ireland.ie">
+			<apn value="3ireland.ie" type="internet" plan="contract">
 				<dns>172.31.140.69</dns>
 				<dns>172.30.140.69</dns>
 			</apn>
@@ -3238,14 +3238,14 @@ conceived.
 		<name>CellCom</name>
 		<gsm>
 			<network-id mcc="425" mnc="02"/>
-			<apn value="internetg"/>
+			<apn value="internetg" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="425" mnc="01"/>
-			<apn value="uinternet">
+			<apn value="uinternet" type="internet" plan="contract">
 				<name>3G Internet</name>
 				<dns>158.43.192.1</dns>
 				<dns>158.43.128.1</dns>
@@ -3256,7 +3256,7 @@ conceived.
 		<name>Pelephone</name>
 		<gsm>
 			<network-id mcc="425" mnc="03"/>
-			<apn value="internet.pelephone.net.il">
+			<apn value="internet.pelephone.net.il" type="internet" plan="contract">
 				<name>3G</name>
 				<username>pcl@3g</username>
 				<password>pcl</password>
@@ -3271,10 +3271,10 @@ conceived.
 		<name>Sure (Cable &amp; Wireless)</name>
 		<gsm>
 			<network-id mcc="234" mnc="55"/>
-			<apn value="wap" type="wap">
+			<apn value="wap" type="wap" plan="contract">
 				<name>WAP</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -3307,13 +3307,13 @@ conceived.
 			<network-id mcc="405" mnc="811"/>
 			<network-id mcc="405" mnc="812"/>
 
-			<apn value="aircelweb">
+			<apn value="aircelweb" type="internet" plan="contract">
 				<name>Web</name>
 			</apn>
-			<apn value="aircelgprs.po">
+			<apn value="aircelgprs.po" type="internet" plan="contract">
 				<name>GPRS (Postpaid)</name>
 			</apn>
-			<apn value="aircelgprs.pr" type="prepaid">
+			<apn value="aircelgprs.pr" type="internet" plan="prepaid">
 				<name>GPRS (Prepaid)</name>
 			</apn>
 		</gsm>
@@ -3345,7 +3345,7 @@ conceived.
 			<network-id mcc="405" mnc="54"/>
 			<network-id mcc="405" mnc="56"/>
 
-			<apn value="airtelgprs.com">
+			<apn value="airtelgprs.com" type="internet" plan="contract">
 				<dns>202.56.230.5</dns>
 				<dns>202.56.240.5</dns>
 			</apn>
@@ -3376,10 +3376,10 @@ conceived.
 			<network-id mcc="405" mnc="754"/>
 			<network-id mcc="405" mnc="755"/>
 			<network-id mcc="405" mnc="756"/>
-			<apn value="www">
+			<apn value="www" type="internet" plan="contract">
 				<name>Vodafone Connect</name>
 			</apn>
-			<apn value="portalnmms" type="mms">
+			<apn value="portalnmms" type="mms" plan="contract">
 				<name>Vodafone Live</name>
 			</apn>
 		</gsm>
@@ -3410,32 +3410,32 @@ conceived.
 			<network-id mcc="404" mnc="81"/>
 
 			<!-- http://cellone.in/cellone_msp.htm -->
-			<apn value="bsnlnet">
+			<apn value="bsnlnet" type="internet" plan="contract">
 				<name>New GPRS/3G</name>
 			</apn>
 
-			<apn value="bsnlwap" type="wap">
+			<apn value="bsnlwap" type="wap" plan="contract">
 				<name>New WAP</name>
 			</apn>
 
-			<apn value="bsnlsouth">
+			<apn value="bsnlsouth" type="internet" plan="contract">
 				<name>Old South Zone A (Karnatka, Andhra Pradesh, Chennai, Tamil Nadu, Kerala)</name>
 			</apn>
-			<apn value="gprssouth.cellone.in">
+			<apn value="gprssouth.cellone.in" type="internet" plan="contract">
 				<name>Old South Zone B (Karnatka, Andhra Pradesh, Chennai, Tamil Nadu, Kerala)</name>
 			</apn>
-			<apn value="gprsnorth.cellone.in">
+			<apn value="gprsnorth.cellone.in" type="internet" plan="contract">
 				<name>Old North Zone (Haryana, Punjab, UP(East), UP(West), Himachal Pradesh, Rajasthan, Jammu &amp; Kashmir)</name>
 			</apn>
-			<apn value="gprswest.cellone.in">
+			<apn value="gprswest.cellone.in" type="internet" plan="contract">
 				<name>Old West Zone (Maharashtra, Gujrat, Madhya Pradesh, Chattishgarh)</name>
 			</apn>
-			<apn value="www.e.pr" type="prepaid">
+			<apn value="www.e.pr" type="internet" plan="prepaid">
 				<name>Old East Zone Prepaid (Jharkhand, Bihar, Kolkata, West Bengal, Orissa, Assam, North East, Adman Nicobar)</name>
 				<dns>218.248.240.208</dns>
 				<dns>218.248.240.135</dns>
 			</apn>
-			<apn value="www.e.po">
+			<apn value="www.e.po" type="internet" plan="contract">
 				<name>Old East Zone Postpaid (Jharkhand, Bihar, Kolkata, West Bengal, Orissa, Assam, North East, Adman Nicobar)</name>
 				<dns>218.248.240.208</dns>
 				<dns>218.248.240.135</dns>
@@ -3460,7 +3460,7 @@ conceived.
 			<network-id mcc="405" mnc="845"/>
 			<network-id mcc="405" mnc="848"/>
 			<network-id mcc="405" mnc="850"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>10.4.42.15</dns>
 			</apn>
 		</gsm>
@@ -3470,17 +3470,17 @@ conceived.
 		<gsm>
 			<network-id mcc="404" mnc="68"/>
 			<network-id mcc="404" mnc="69"/>
-			<apn value="gprsmtnldel">
+			<apn value="gprsmtnldel" type="internet" plan="contract">
 				<name>Delhi</name>
 				<username>mtnl</username>
 				<password>mtnl123</password>
 			</apn>
-			<apn value="gprsppsmum" type="prepaid">
+			<apn value="gprsppsmum" type="internet" plan="prepaid">
 				<name>Mumbai (Prepaid)</name>
 				<username>mtnl</username>
 				<password>mtnl123</password>
 			</apn>
-			<apn value="gprsmtnlmum">
+			<apn value="gprsmtnlmum" type="internet" plan="contract">
 				<name>Mumbai (Postpaid / Plan 2)</name>
 				<username>mtnl</username>
 				<password>mtnl123</password>
@@ -3498,10 +3498,10 @@ conceived.
 			<network-id mcc="405" mnc="05"/>
 			<network-id mcc="405" mnc="10"/>
 			<network-id mcc="405" mnc="13"/>
-			<apn value="smartnet">
+			<apn value="smartnet" type="internet" plan="contract">
 				<name>Smart Net</name>
 			</apn>
-			<apn value="smartwap" type="wap">
+			<apn value="smartwap" type="wap" plan="contract">
 				<name>Smart WAP</name>
 			</apn>
 		</gsm>
@@ -3536,11 +3536,11 @@ conceived.
 			<network-id mcc="404" mnc="14"/>
 			<network-id mcc="404" mnc="44"/>
 
-			<apn value="Simplyenjoy">
+			<apn value="Simplyenjoy" type="internet" plan="contract">
 				<username>spice</username>
 				<password>spice</password>
 			</apn>
-			<apn value="simplydownload">
+			<apn value="simplydownload" type="internet" plan="contract">
 				<name>kar</name>
 			</apn>
 		</gsm>
@@ -3569,7 +3569,7 @@ conceived.
 			<network-id mcc="405" mnc="046"/>
 			<network-id mcc="405" mnc="047"/>
 
-			<apn value="TATA.DOCOMO.INTERNET">
+			<apn value="TATA.DOCOMO.INTERNET" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -3625,7 +3625,7 @@ conceived.
 		<name>Korek</name>
 		<gsm>
 			<network-id mcc="418" mnc="40"/>
-			<apn value="net.korek.com">
+			<apn value="net.korek.com" type="internet" plan="contract">
 				<username>korek</username>
 				<password>korek</password>
 			</apn>
@@ -3635,7 +3635,7 @@ conceived.
 		<name>Asia Cell</name>
 		<gsm>
 			<network-id mcc="418" mnc="50"/>
-			<apn value="net.asiacell.com">
+			<apn value="net.asiacell.com" type="internet" plan="contract">
 			</apn>
 		</gsm>
 	</provider>
@@ -3647,7 +3647,7 @@ conceived.
 		<name>Ù?Ù?راÙ? اÙ?Ù?</name>
 		<gsm>
 			<network-id mcc="432" mnc="11"/>
-			<apn value="mcinet">
+			<apn value="mcinet" type="internet" plan="contract">
 			</apn>
 		</gsm>
 	</provider>
@@ -3655,7 +3655,7 @@ conceived.
 		<name>اÛ?راÙ?سÙ?</name>
 		<gsm>
 			<network-id mcc="432" mnc="35"/>
-			<apn value="mtnirancell">
+			<apn value="mtnirancell" type="internet" plan="contract">
 			</apn>
 		</gsm>
 	</provider>
@@ -3668,14 +3668,14 @@ conceived.
 		<gsm>
 			<network-id mcc="274" mnc="02"/>
 			<network-id mcc="274" mnc="03"/>
-			<apn value="vmc.gprs.is"/>
+			<apn value="vmc.gprs.is" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Nova</name>
 		<gsm>
 			<network-id mcc="274" mnc="11"/>
-			<apn value="internet.nova.is">
+			<apn value="internet.nova.is" type="internet" plan="contract">
 				<dns>192.168.190.54</dns>
 				<dns>192.168.190.55</dns>
 			</apn>
@@ -3685,7 +3685,7 @@ conceived.
 		<name>Síminn</name>
 		<gsm>
 			<network-id mcc="274" mnc="01"/>
-			<apn value="wap.simi.is">
+			<apn value="wap.simi.is" type="internet" plan="contract">
 				<dns>194.105.224.1</dns>
 				<dns>212.30.200.200</dns>
 			</apn>
@@ -3699,10 +3699,10 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="222" mnc="10"/>
-			<apn value="mobile.vodafone.it">
+			<apn value="mobile.vodafone.it" type="internet" plan="contract">
 				<name>Mobile Internet</name>
 			</apn>
-			<apn value="web.omnitel.it">
+			<apn value="web.omnitel.it" type="internet" plan="contract">
 				<name>Internet Facile (old)</name>
 				<dns>83.224.70.62</dns>
 				<dns>83.224.70.78</dns>
@@ -3713,12 +3713,12 @@ conceived.
 		<name>TIM</name>
 		<gsm>
 			<network-id mcc="222" mnc="01"/>
-			<apn value="ibox.tim.it">
+			<apn value="ibox.tim.it" type="internet" plan="contract">
 				<name>Maxxi Alice/Internet</name>
 				<dns>217.200.200.42</dns>
 				<dns>213.230.129.10</dns>
 			</apn>
-			<apn value="wap.tim.it" type="wap">
+			<apn value="wap.tim.it" type="wap" plan="contract">
 				<name>WAP</name>
 				<username>WAPTIM</username>
 				<dns>213.230.155.94</dns>
@@ -3730,14 +3730,14 @@ conceived.
 		<name>Wind</name>
 		<gsm>
 			<network-id mcc="222" mnc="88"/>
-			<apn value="internet.wind">
+			<apn value="internet.wind" type="internet" plan="contract">
 				<name>Non-business</name>
 				<username>Wind</username>
 				<password>Wind</password>
 				<dns>193.70.152.25</dns>
 				<dns>193.70.192.25</dns>
 			</apn>
-			<apn value="internet.wind.biz">
+			<apn value="internet.wind.biz" type="internet" plan="contract">
 				<name>Business</name>
 				<username>Wind</username>
 				<password>Wind</password>
@@ -3750,12 +3750,12 @@ conceived.
 		<name>3</name>
 		<gsm>
 			<network-id mcc="222" mnc="99"/>
-			<apn value="tre.it">
+			<apn value="tre.it" type="internet" plan="contract">
 				<name>Ricaricabile</name>
 				<dns>62.13.169.92</dns>
 				<dns>62.13.169.93</dns>
 			</apn>
-			<apn value="datacard.tre.it">
+			<apn value="datacard.tre.it" type="internet" plan="contract">
 				<name>Abbonamento</name>
 			</apn>
 		</gsm>
@@ -3764,10 +3764,10 @@ conceived.
 		<name>Fastweb</name>
 		<gsm>
 			<network-id mcc="222" mnc="99"/>
-			<apn value="apn.fastweb.it">
+			<apn value="apn.fastweb.it" type="internet" plan="contract">
 				<name>Voce/dati</name>
 			</apn>
-			<apn value="datacard.fastweb.it">
+			<apn value="datacard.fastweb.it" type="internet" plan="contract">
 				<name>Solo dati</name>
 				<dns>213.140.2.43</dns>
 				<dns>213.140.2.49</dns>
@@ -3778,14 +3778,14 @@ conceived.
 		<name>PosteMobile</name>
 		<gsm>
 			<network-id mcc="222" mnc="10"/>
-			<apn value="internet.postemobile.it"/>
+			<apn value="internet.postemobile.it" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>CoopVoce</name>
 		<gsm>
 			<network-id mcc="222" mnc="01"/>
-			<apn value="web.coopvoce.it">
+			<apn value="web.coopvoce.it" type="internet" plan="contract">
 				<name>Internet Mobile</name>
 			</apn>
 		</gsm>
@@ -3798,10 +3798,10 @@ conceived.
 		<name>Sure (Cable &amp; Wireless)</name>
 		<gsm>
 			<network-id mcc="234" mnc="55"/>
-			<apn value="wap" type="wap">
+			<apn value="wap" type="wap" plan="contract">
 				<name>WAP</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -3810,7 +3810,7 @@ conceived.
 		<name>Jersey Telecom</name>
 		<gsm>
 			<network-id mcc="234" mnc="50"/>
-			<apn value="pepper">
+			<apn value="pepper" type="internet" plan="contract">
 				<username>abc</username>
 				<password>abc</password>
 				<dns>212.9.0.135</dns>
@@ -3826,14 +3826,14 @@ conceived.
 		<name>Cable &amp; Wireless</name>
 		<gsm>
 			<network-id mcc="338" mnc="020"/>
-			<apn value="wap"/>
+			<apn value="wap" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="338" mnc="050"/>
-			<apn value="web.digiceljamaica.com">
+			<apn value="web.digiceljamaica.com" type="internet" plan="contract">
 				<username>wapuser</username>
 				<password>wap03jam</password>
 				<dns>208.131.176.126</dns>
@@ -3849,7 +3849,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="416" mnc="77"/>
-			<apn value="net.orange.jo">
+			<apn value="net.orange.jo" type="internet" plan="contract">
 				<name>Mobile Broadband</name>
 				<username>net</username>
 				<password>net</password>
@@ -3860,7 +3860,7 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="416" mnc="01"/>
-			<apn value="zain">
+			<apn value="zain" type="internet" plan="contract">
 				<name>Mobile Broadband</name>
 				<username>Zain</username>
 				<password>Zain</password>
@@ -3894,7 +3894,7 @@ conceived.
 			<network-id mcc="440" mnc="96"/>
 			<network-id mcc="440" mnc="97"/>
 			<network-id mcc="440" mnc="98"/>
-			<apn value="softbank">
+			<apn value="softbank" type="internet" plan="contract">
 				<username>ai@softbank</username>
 				<password>softbank</password>
 			</apn>
@@ -3904,7 +3904,7 @@ conceived.
 		<name>b-mobile</name>
 		<gsm>
 			<network-id mcc="440" mnc="10"/>
-			<apn value="dm.jplat.net">
+			<apn value="dm.jplat.net" type="internet" plan="contract">
 				<name>u300</name>
 				<username>bmobile@u300</username>
 				<password>bmobile</password>
@@ -3915,7 +3915,7 @@ conceived.
 		<name>e-mobile</name>
 		<gsm>
 			<network-id mcc="440" mnc="00"/>
-			<apn value="emb.ne.jp">
+			<apn value="emb.ne.jp" type="internet" plan="contract">
 				<username>em</username>
 				<password>em</password>
 			</apn>
@@ -3972,10 +3972,10 @@ conceived.
 			<network-id mcc="440" mnc="87"/>
 			<network-id mcc="440" mnc="99"/>
 
-			<apn value="mopera.ne.jp">
+			<apn value="mopera.ne.jp" type="internet" plan="contract">
 				<name>mopera</name>
 			</apn>
-			<apn value="mopera.net">
+			<apn value="mopera.net" type="internet" plan="contract">
 				<name>mopera U</name>
 			</apn>
 		</gsm>
@@ -3997,14 +3997,14 @@ conceived.
 		<name>Zain / Celtel</name>
 		<gsm>
 			<network-id mcc="639" mnc="03"/>
-			<apn value="ke.celtel.com"/>
+			<apn value="ke.celtel.com" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Safaricom</name>
 		<gsm>
 			<network-id mcc="639" mnc="02"/>
-			<apn value="web.safaricom.com">
+			<apn value="web.safaricom.com" type="internet" plan="contract">
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -4014,14 +4014,14 @@ conceived.
 		<name>yu (Econet)</name>
 		<gsm>
 			<network-id mcc="639" mnc="05"/>
-			<apn value="internet.econet.co.ke"/>
+			<apn value="internet.econet.co.ke" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="639" mnc="07"/>
-			<apn value="bew.orange.co.ke"/>
+			<apn value="bew.orange.co.ke" type="internet" plan="contract"/>
 		</gsm>
 		<cdma>
 			<name>Orange Fixed Plus</name>
@@ -4035,19 +4035,19 @@ conceived.
 		<name>hello</name>
 		<gsm>
 			<network-id mcc="456" mnc="02"/>
-			<apn value="hellowww"/>
+			<apn value="hellowww" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mobitel</name>
 		<gsm>
 			<network-id mcc="456" mnc="01"/>
-			<apn value="3g">
+			<apn value="3g" type="internet" plan="contract">
 				<name>CellCard Corporate</name>
 				<username>mobitel</username>
 				<password>mobitel</password>
 			</apn>
-			<apn value="3gtv">
+			<apn value="3gtv" type="internet" plan="contract">
 				<name>CellCard Unlimited</name>
 				<username>mobitel</username>
 				<password>mobitel</password>
@@ -4058,7 +4058,7 @@ conceived.
 		<name>qb</name>
 		<gsm>
 			<network-id mcc="456" mnc="04"/>
-			<apn value="WAP">
+			<apn value="WAP" type="internet" plan="contract">
 				<name>QBmore</name>
 			</apn>
 		</gsm>
@@ -4067,7 +4067,7 @@ conceived.
 		<name>Star-Cell</name>
 		<gsm>
 			<network-id mcc="456" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -4082,7 +4082,7 @@ conceived.
 		<name>KTF</name>
 		<gsm>
 			<network-id mcc="450" mnc="08"/>
-			<apn value="hsdpa-internet.ktfwing.com"/>
+			<apn value="hsdpa-internet.ktfwing.com" type="internet" plan="contract"/>
 		</gsm>
 		<cdma>
 			<!-- cid: "016" -->
@@ -4106,7 +4106,7 @@ conceived.
 		<name>SKTelecom</name>
 		<gsm>
 			<network-id mcc="450" mnc="05"/>
-			<apn value="nate.sktelecom.com"/>
+			<apn value="nate.sktelecom.com" type="internet" plan="contract"/>
 		</gsm>
 		<cdma>
 			<!-- cid: 1501 -->
@@ -4121,12 +4121,12 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="419" mnc="02"/>
-			<apn value="pps">
+			<apn value="pps" type="internet" plan="contract">
 				<name>Personal</name>
 				<username>pps</username>
 				<password>pps</password>
 			</apn>
-			<apn value="apn01">
+			<apn value="apn01" type="internet" plan="contract">
 				<name>Corporate</name>
 			</apn>
 		</gsm>
@@ -4135,14 +4135,14 @@ conceived.
 		<name>Wataniya</name>
 		<gsm>
 			<network-id mcc="419" mnc="03"/>
-			<apn value="action.wataniya.com"/>
+			<apn value="action.wataniya.com" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Viva</name>
 		<gsm>
 			<network-id mcc="419" mnc="04"/>
-			<apn value="viva"/>
+			<apn value="viva" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4153,7 +4153,7 @@ conceived.
 		<name>Beeline</name>
 		<gsm>
 			<network-id mcc="401" mnc="01"/>
-			<apn value="internet.beeline.kz">
+			<apn value="internet.beeline.kz" type="internet" plan="contract">
 				<username>@internet.beeline</username>
 				<dns>212.19.149.53</dns>
 				<dns>194.226.128.1</dns>
@@ -4164,7 +4164,7 @@ conceived.
 		<name>K'CELL</name>
 		<gsm>
 			<network-id mcc="401" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -4172,14 +4172,14 @@ conceived.
 		<name>Activ</name>
 		<gsm>
 			<network-id mcc="401" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Neo</name>
 		<gsm>
 			<network-id mcc="401" mnc="77"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -4204,7 +4204,7 @@ conceived.
 		<name>ETL</name>
 		<gsm>
 			<network-id mcc="457" mnc="02"/>
-			<apn value="etlnet">
+			<apn value="etlnet" type="internet" plan="contract">
 				<dns>192.168.4.130</dns>
 			</apn>
 		</gsm>
@@ -4217,7 +4217,7 @@ conceived.
 		<name>MTC Touch</name>
 		<gsm>
 			<network-id mcc="415" mnc="03"/>
-			<apn value="gprs.mtctouch.com.lb"/>
+			<apn value="gprs.mtctouch.com.lb" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4228,7 +4228,7 @@ conceived.
 		<name>Cable &amp; Wireless</name>
 		<gsm>
 			<network-id mcc="358" mnc="110"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4239,23 +4239,23 @@ conceived.
 		<name>Airtel</name>
 		<gsm>
 			<network-id mcc="413" mnc="05"/>
-			<apn value="www.wap.airtel.lk"/>
+			<apn value="www.wap.airtel.lk" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Dialog GSM</name>
 		<gsm>
 			<network-id mcc="413" mnc="02"/>
-			<apn value="www.dialogsl.com">
+			<apn value="www.dialogsl.com" type="internet" plan="contract">
 				<name>Postpaid</name>
 			</apn>
-			<apn value="ppinternet" type="prepaid">
+			<apn value="ppinternet" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 			</apn>
-			<apn value="dialogbb">
+			<apn value="dialogbb" type="internet" plan="contract">
 				<name>Unlimited Broadband</name>
 			</apn>
-			<apn value="kitbb.com" type="prepaid">
+			<apn value="kitbb.com" type="internet" plan="prepaid">
 				<name>Prepaid (Kitbb)</name>
 			</apn>
 		</gsm>
@@ -4264,21 +4264,21 @@ conceived.
 		<name>Hutch</name>
 		<gsm>
 			<network-id mcc="413" mnc="08"/>
-			<apn value="htwap"/>
+			<apn value="htwap" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mobitel</name>
 		<gsm>
 			<network-id mcc="413" mnc="01"/>
-			<apn value="isp"/>
+			<apn value="isp" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="413" mnc="03"/>
-			<apn value="wap"/>
+			<apn value="wap" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4289,7 +4289,7 @@ conceived.
 		<name>Bite</name>
 		<gsm>
 			<network-id mcc="246" mnc="02"/>
-			<apn value="banga">
+			<apn value="banga" type="internet" plan="contract">
 				<username>bite</username>
 				<dns>213.226.131.131</dns>
 				<dns>193.219.88.36</dns>
@@ -4300,19 +4300,19 @@ conceived.
 		<name>TELE2 GPRS</name>
 		<gsm>
 			<network-id mcc="246" mnc="03"/>
-			<apn value="internet.tele2.lt"/>
+			<apn value="internet.tele2.lt" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Omnitel (contract)</name>
 		<gsm>
 			<network-id mcc="246" mnc="01"/>
-			<apn value="gprs.omnitel.net">
+			<apn value="gprs.omnitel.net" type="internet" plan="contract">
 				<name>Contract</name>
 				<dns>194.176.32.129</dns>
 				<dns>195.22.175.1</dns>
 			</apn>
-			<apn value="gprs.startas.lt">
+			<apn value="gprs.startas.lt" type="internet" plan="contract">
 				<name>No contract</name>
 				<username>omni</username>
 				<password>omni</password>
@@ -4329,7 +4329,7 @@ conceived.
 		<name>LUXGSM</name>
 		<gsm>
 			<network-id mcc="270" mnc="01"/>
-			<apn value="web.pt.lu">
+			<apn value="web.pt.lu" type="internet" plan="contract">
 				<dns>194.154.192.101</dns>
 				<dns>194.154.192.102</dns>
 			</apn>
@@ -4339,12 +4339,12 @@ conceived.
 		<name>Tango</name>
 		<gsm>
 			<network-id mcc="270" mnc="77"/>
-			<apn value="hspa">
+			<apn value="hspa" type="internet" plan="contract">
 				<name>hspa</name>
 				<username>tango</username>
 				<password>tango</password>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>internet</name>
 				<username>tango</username>
 				<password>tango</password>
@@ -4357,7 +4357,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="270" mnc="99"/>
-			<apn value="orange.lu">
+			<apn value="orange.lu" type="internet" plan="contract">
 				<dns>85.94.224.1</dns>
 				<dns>85.94.224.2</dns>
 			</apn>
@@ -4367,7 +4367,7 @@ conceived.
 		<name>VOXmobile</name>
 		<gsm>
 			<network-id mcc="270" mnc="99"/>
-			<apn value="vox.lu"/>
+			<apn value="vox.lu" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4378,14 +4378,14 @@ conceived.
 		<name>LMT</name>
 		<gsm>
 			<network-id mcc="247" mnc="01"/>
-			<apn value="internet.lmt.lv">
+			<apn value="internet.lmt.lv" type="internet" plan="contract">
 				<dns>212.93.96.2</dns>
 				<dns>212.93.96.4</dns>
 			</apn>
-			<apn value="open.lmt.lv">
+			<apn value="open.lmt.lv" type="internet" plan="contract">
 				<name>O!Karte internet</name>
 			</apn>
-			<apn value="okarte.lmt.lv">
+			<apn value="okarte.lmt.lv" type="internet" plan="contract">
 				<name>O!Karte</name>
 			</apn>
 		</gsm>
@@ -4394,17 +4394,17 @@ conceived.
 		<name>Tele2</name>
 		<gsm>
 			<network-id mcc="247" mnc="02"/>
-			<apn value="internet.tele2.lv">
+			<apn value="internet.tele2.lv" type="internet" plan="contract">
 				<name>Regular</name>
 				<username>gprs</username>
 				<password>internet</password>
 			</apn>
-			<apn value="mobileinternet.tele2.lv">
+			<apn value="mobileinternet.tele2.lv" type="internet" plan="contract">
 				<name>Mobile Internet</name>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
-			<apn value="data.tele2.lv">
+			<apn value="data.tele2.lv" type="internet" plan="contract">
 				<name>Zelta Zivtina</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -4415,10 +4415,10 @@ conceived.
 		<name>Bite</name>
 		<gsm>
 			<network-id mcc="247" mnc="05"/>
-			<apn value="wap">
+			<apn value="wap" type="internet" plan="contract">
 				<name>Bite plus</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Prepaid/Contract</name>
 			</apn>
 		</gsm>
@@ -4431,7 +4431,7 @@ conceived.
 		<name>Ittissalat Al Maghrib</name>
 		<gsm>
 			<network-id mcc="604" mnc="01"/>
-			<apn value="iam">
+			<apn value="iam" type="internet" plan="contract">
 				<username>wac</username>
 				<password>1987</password>
 			</apn>
@@ -4441,7 +4441,7 @@ conceived.
 		<name>Medi Telecom</name>
 		<gsm>
 			<network-id mcc="604" mnc="00"/>
-			<apn value="wap.meditel.ma">
+			<apn value="wap.meditel.ma" type="internet" plan="contract">
 				<username>MEDIWAP</username>
 				<password>MEDIWAP</password>
 			</apn>
@@ -4455,7 +4455,7 @@ conceived.
 		<name>Moldcell</name>
 		<gsm>
 			<network-id mcc="259" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Internet</name>
 				<username>gprs</username>
 				<password>gprs</password>
@@ -4466,7 +4466,7 @@ conceived.
 		<name>Eventis</name>
 		<gsm>
 			<network-id mcc="259" mnc="04"/>
-			<apn value="internet.md">
+			<apn value="internet.md" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -4475,7 +4475,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="259" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -4488,27 +4488,27 @@ conceived.
 		<name>ProMonte GSM</name>
 		<gsm>
 			<network-id mcc="297" mnc="01"/>
-			<apn value="gprs.promonte.com"/>
+			<apn value="gprs.promonte.com" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="297" mnc="02"/>
-			<apn value="tmcg-data">
+			<apn value="tmcg-data" type="internet" plan="contract">
 				<name>Mobile Broadband</name>
 				<username>38267</username>
 				<password>38267</password>
 			</apn>
-			<apn value="tmcg-nw">
+			<apn value="tmcg-nw" type="internet" plan="contract">
 				<name>GPRS</name>
 				<username>38267</username>
 				<password>38267</password>
 			</apn>
-			<apn value="internet-postpaid">
+			<apn value="internet-postpaid" type="internet" plan="contract">
 				<name>Postpaid (old)</name>
 			</apn>
-			<apn value="internet-prepaid" type="prepaid">
+			<apn value="internet-prepaid" type="internet" plan="prepaid">
 				<name>Prepaid (old)</name>
 			</apn>
 		</gsm>
@@ -4517,7 +4517,7 @@ conceived.
 		<name>m:tel</name>
 		<gsm>
 			<network-id mcc="297" mnc="03"/>
-			<apn value="gprsinternet"/>
+			<apn value="gprsinternet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4528,7 +4528,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="610" mnc="02"/>
-			<apn value="iew">
+			<apn value="iew" type="internet" plan="contract">
 				<username>iew</username>
 				<password>iew</password>
 			</apn>
@@ -4542,7 +4542,7 @@ conceived.
 		<name>MobiCom</name>
 		<gsm>
 			<network-id mcc="428" mnc="99"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4554,7 +4554,7 @@ conceived.
 		<gsm>
 			<network-id mcc="455" mnc="03"/>
 			<network-id mcc="455" mnc="05"/>
-			<apn value="web.hutchisonmacau.com">
+			<apn value="web.hutchisonmacau.com" type="internet" plan="contract">
 				<username>hutchison</username>
 				<password>1234</password>
 			</apn>
@@ -4565,7 +4565,7 @@ conceived.
 		<gsm>
 			<network-id mcc="455" mnc="01"/>
 			<network-id mcc="455" mnc="04"/>
-			<apn value="ctm-mobile"/>
+			<apn value="ctm-mobile" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -4580,7 +4580,7 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="294" mnc="03"/>
-			<apn value="vipoperator">
+			<apn value="vipoperator" type="internet" plan="contract">
 				<username>vipoperator</username>
 				<password>vipoperator</password>
 			</apn>
@@ -4594,10 +4594,10 @@ conceived.
 		<name>GO Mobile</name>
 		<gsm>
 			<network-id mcc="278" mnc="21"/>
-			<apn value="gosurfing">
+			<apn value="gosurfing" type="internet" plan="contract">
 				<name>Postpaid</name>
 			</apn>
-			<apn value="rtgsurfing" type="prepaid">
+			<apn value="rtgsurfing" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -4606,7 +4606,7 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="278" mnc="01"/>
-			<apn value="Internet">
+			<apn value="Internet" type="internet" plan="contract">
 				<username>Internet</username>
 				<password>Internet</password>
 			</apn>
@@ -4620,7 +4620,7 @@ conceived.
 		<name>Emtel</name>
 		<gsm>
 			<network-id mcc="617" mnc="10"/>
-			<apn value="WEB"/>
+			<apn value="WEB" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4631,14 +4631,14 @@ conceived.
 		<name>Dhiraagu</name>
 		<gsm>
 			<network-id mcc="472" mnc="01"/>
-			<apn value="internet.dhimobile"/>
+			<apn value="internet.dhimobile" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Wataniya</name>
 		<gsm>
 			<network-id mcc="472" mnc="02"/>
-			<apn value="WataniyaNet"/>
+			<apn value="WataniyaNet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4649,7 +4649,7 @@ conceived.
 		<name>TNM</name>
 		<gsm>
 			<network-id mcc="650" mnc="01"/>
-			<apn value="Internet"/>
+			<apn value="Internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -4660,7 +4660,7 @@ conceived.
 		<name>Telcel</name>
 		<gsm>
 			<network-id mcc="334" mnc="02"/>
-			<apn value="internet.itelcel.com">
+			<apn value="internet.itelcel.com" type="internet" plan="contract">
 				<username>webgprs</username>
 				<password>webgprs2002</password>
 			</apn>
@@ -4670,7 +4670,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="334" mnc="03"/>
-			<apn value="internet.movistar.mx">
+			<apn value="internet.movistar.mx" type="internet" plan="contract">
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
@@ -4688,12 +4688,12 @@ conceived.
 		<name>DiGi</name>
 		<gsm>
 			<network-id mcc="502" mnc="16"/>
-			<apn value="diginet">
+			<apn value="diginet" type="internet" plan="contract">
 				<name>Mobile Internet</name>
 				<dns>203.92.128.131</dns>
 				<dns>203.92.128.132</dns>
 			</apn>
-			<apn value="3gdgnet">
+			<apn value="3gdgnet" type="internet" plan="contract">
 				<name>Broadband</name>
 			</apn>
 		</gsm>
@@ -4703,17 +4703,17 @@ conceived.
 		<gsm>
 			<network-id mcc="502" mnc="12"/>
 			<network-id mcc="502" mnc="17"/>
-			<apn value="maxisbb">
+			<apn value="maxisbb" type="internet" plan="contract">
 				<name>Broadband</name>
 				<username>maxis</username>
 				<password>wap</password>
 			</apn>
-			<apn value="net">
+			<apn value="net" type="internet" plan="contract">
 				<name>GPRS</name>
 				<username>maxis</username>
 				<password>net</password>
 			</apn>
-			<apn value="unet">
+			<apn value="unet" type="internet" plan="contract">
 				<name>3G (handsets)</name>
 				<username>maxis</username>
 				<password>wap</password>
@@ -4728,11 +4728,11 @@ conceived.
 			<network-id mcc="502" mnc="13"/>
 			<network-id mcc="502" mnc="19"/>
 			<!-- http://www.channelx.com.my/mdp/gprs/internet_config.jsp?model_name=motorola_e398 -->
-			<apn value="celcom.net.my">
+			<apn value="celcom.net.my" type="internet" plan="contract">
 				<name>GPRS</name>
 			</apn>
 			<!-- http://www.channelx.com.my/mdp/3g/wap_config_3g.jsp?model_name=huwei_u600_3g -->
-			<apn value="celcom3g">
+			<apn value="celcom3g" type="internet" plan="contract">
 				<name>Celcom 3G</name>
 			</apn>
 		</gsm>
@@ -4745,7 +4745,7 @@ conceived.
 		<name>MCel</name>
 		<gsm>
 			<network-id mcc="643" mnc="01"/>
-			<apn value="isp.mcel.mz">
+			<apn value="isp.mcel.mz" type="internet" plan="contract">
 				<username>guest</username>
 				<password>guest</password>
 				<dns>212.96.24.2</dns>
@@ -4757,7 +4757,7 @@ conceived.
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="643" mnc="04"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Contract / Prepaid</name>
 			</apn>
 		</gsm>
@@ -4770,12 +4770,12 @@ conceived.
 		<name>MTC</name>
 		<gsm>
 			<network-id mcc="649" mnc="01"/>
-			<apn value="ppsinternet">
+			<apn value="ppsinternet" type="internet" plan="contract">
 				<name>Tango</name>
 				<username>ppsuser</username>
 				<password>ppsuser</password>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Contract</name>
 			</apn>
 		</gsm>
@@ -4791,7 +4791,7 @@ conceived.
 		<name>Leo</name>
 		<gsm>
 			<network-id mcc="649" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Leo</name>
 			</apn>
 		</gsm>
@@ -4805,7 +4805,7 @@ conceived.
 		<gsm>
 			<network-id mcc="621" mnc="20"/>
 			<network-id mcc="621" mnc="80"/>
-			<apn value="wap">
+			<apn value="wap" type="internet" plan="contract">
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -4816,7 +4816,7 @@ conceived.
 		<gsm>
 			<network-id mcc="621" mnc="30"/>
 			<network-id mcc="621" mnc="60"/>
-			<apn value="web.gprs.mtnnigeria.net">
+			<apn value="web.gprs.mtnnigeria.net" type="internet" plan="contract">
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -4827,12 +4827,12 @@ conceived.
 		<gsm>
 			<network-id mcc="621" mnc="50"/>
 			<network-id mcc="621" mnc="70"/>
-			<apn value="glosecure">
+			<apn value="glosecure" type="internet" plan="contract">
 				<name>Pay as You Go</name>
 				<username>gprs</username>
 				<password>gprs</password>
 			</apn>
-			<apn value="gloflat">
+			<apn value="gloflat" type="internet" plan="contract">
 				<name>Glo 3G Packs</name>
 				<username>flat</username>
 				<password>flat</password>
@@ -4843,7 +4843,7 @@ conceived.
 		<name>Etisalat</name>
 		<gsm>
 			<network-id mcc="621" mnc="90"/>
-			<apn value="etisalat">
+			<apn value="etisalat" type="internet" plan="contract">
 				<name>Etisalat Internet</name>
 			</apn>
 		</gsm>
@@ -4857,22 +4857,22 @@ conceived.
 		<gsm>
 			<network-id mcc="710" mnc="21"/>
 			<network-id mcc="710" mnc="73"/>
-			<apn value="wap.emovil" type="wap">
+			<apn value="wap.emovil" type="wap" plan="contract">
 				<name>WAP</name>
 				<username>wapemovil</username>
 				<password>wapemovil</password>
 			</apn>
-			<apn value="web.emovil">
+			<apn value="web.emovil" type="internet" plan="contract">
 				<name>Web</name>
 				<username>webemovil</username>
 				<password>webemovil</password>
 			</apn>
-			<apn value="internet.ideasalo.ni">
+			<apn value="internet.ideasalo.ni" type="internet" plan="contract">
 				<name>Web (Alo pcs)</name>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
-			<apn value="wap.ideasalo.ni" type="wap">
+			<apn value="wap.ideasalo.ni" type="wap" plan="contract">
 				<name>WAP (Alo pcs)</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -4883,7 +4883,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="710" mnc="30"/>
-			<apn value="internet.movistar.ni">
+			<apn value="internet.movistar.ni" type="internet" plan="contract">
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -4897,22 +4897,22 @@ conceived.
 		<name>Hi</name>
 		<gsm>
 			<network-id mcc="204" mnc="08"/>
-			<apn value="portalmmm.nl"/>
+			<apn value="portalmmm.nl" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>KPN NL</name>
 		<gsm>
 			<network-id mcc="204" mnc="08"/>
-			<apn value="prepaidinternet" />
-			<apn value="fastinternet" />
-			<apn value="internet">
+			<apn value="prepaidinternet" type="internet" plan="contract" />
+			<apn value="fastinternet" type="internet" plan="contract" />
+			<apn value="internet" type="internet" plan="contract">
 				<username>KPN</username>
 				<password>gprs</password>
 				<dns>62.133.126.28</dns>
 				<dns>62.133.126.29</dns>
 			</apn>
-			<apn value="noapn">
+			<apn value="noapn" type="internet" plan="contract">
 				<dns>62.133.126.28</dns>
 				<dns>62.133.126.29</dns>
 			</apn>
@@ -4922,7 +4922,7 @@ conceived.
 		<name>Telfort</name>
 		<gsm>
 			<network-id mcc="204" mnc="12"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>telfortnl</username>
 			</apn>
 		</gsm>
@@ -4931,7 +4931,7 @@ conceived.
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="204" mnc="16"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>193.78.240.12</dns>
 				<dns>193.79.242.39</dns>
 			</apn>
@@ -4941,7 +4941,7 @@ conceived.
 		<name>Ben</name>
 		<gsm>
 			<network-id mcc="204" mnc="16"/>
-			<apn value="internet.ben">
+			<apn value="internet.ben" type="internet" plan="contract">
 				<dns>193.78.240.12</dns>
 				<dns>193.79.242.39</dns>
 			</apn>
@@ -4951,7 +4951,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="204" mnc="20"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
@@ -4961,13 +4961,13 @@ conceived.
 		<name>Tele2</name>
 		<gsm>
 			<network-id mcc="204" mnc="02"/>
-			<apn value="data.tele2.nl"/>
+			<apn value="data.tele2.nl" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>XS4ALL Mobiel Internet</name>
 		<gsm>
-			<apn value="umts.xs4all.nl">
+			<apn value="umts.xs4all.nl" type="internet" plan="contract">
 				<username>xs4all</username>
 				<password>xs4all</password>
 			</apn>
@@ -4977,14 +4977,14 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="204" mnc="04"/>
-			<apn value="live.vodafone.com">
+			<apn value="live.vodafone.com" type="internet" plan="contract">
 				<name>Non-business</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 				<dns>62.140.138.237</dns>
 				<dns>62.140.140.250</dns>
 			</apn>
-			<apn value="office.vodafone.nl">
+			<apn value="office.vodafone.nl" type="internet" plan="contract">
 				<name>Business</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
@@ -4999,7 +4999,7 @@ conceived.
 		<name>Netcom</name>
 		<gsm>
 			<network-id mcc="242" mnc="02"/>
-			<apn value="internet.netcom.no">
+			<apn value="internet.netcom.no" type="internet" plan="contract">
 				<username>netcom</username>
 				<password>netcom</password>
 				<dns>212.169.123.67</dns>
@@ -5023,7 +5023,7 @@ conceived.
 				<dtmf>220</dtmf>
 				<sms text="saldo">222</sms>
 			</balance-check>
-			<apn value="telenor">
+			<apn value="telenor" type="internet" plan="contract">
 				<dns>212.17.131.3</dns>
 				<dns>148.122.161.2</dns>
 			</apn>
@@ -5033,7 +5033,7 @@ conceived.
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="242" mnc="08"/>
-			<apn value="internet.no">
+			<apn value="internet.no" type="internet" plan="contract">
 				<dns>80.232.41.10</dns>
 				<dns>80.232.41.20</dns>
 			</apn>
@@ -5043,53 +5043,53 @@ conceived.
 		<name>NetworkNorway</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>OneCall</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Lebara</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Altibox</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SheTalks</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Telipol</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Ventelo</name>
 		<gsm>
 			<network-id mcc="242" mnc="07"/>
-			<apn value="internet.ventelo.no"/>
+			<apn value="internet.ventelo.no" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Ludo Mobil</name>
 		<gsm>
 			<network-id mcc="242" mnc="07"/>
-			<apn value="internet.ventelo.no"/>
+			<apn value="internet.ventelo.no" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -5101,11 +5101,11 @@ conceived.
 				<ussd>*111#</ussd>
 				<dtmf>47300000</dtmf>
 			</balance-check>
-			<apn value="internet.tele2.no">
+			<apn value="internet.tele2.no" type="internet" plan="contract">
 				<name>Mobilt internet</name>
 			</apn>
 			<!-- http://www.tele2.no/mobilt-bredbaand.html -->
-			<apn value="mobileinternet.tele2.no">
+			<apn value="mobileinternet.tele2.no" type="internet" plan="contract">
 				<name>Mobilt bredbånd</name>
 			</apn>
 		</gsm>
@@ -5118,14 +5118,14 @@ conceived.
 		<name>Nepal Telecom</name>
 		<gsm>
 			<network-id mcc="429" mnc="01"/>
-			<apn value="ntnet"/>
+			<apn value="ntnet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mero Mobile</name>
 		<gsm>
 			<network-id mcc="429" mnc="02"/>
-			<apn value="mero"/>
+			<apn value="mero" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -5137,16 +5137,16 @@ conceived.
 		<gsm>
 			<network-id mcc="530" mnc="00"/>
 			<network-id mcc="530" mnc="05"/>
-			<apn value="wap.telecom.co.nz" type="wap">
+			<apn value="wap.telecom.co.nz" type="wap" plan="contract">
 				<name>XT mobile (WAP)</name>
 			</apn>
-			<apn value="internet.telecom.co.nz">
+			<apn value="internet.telecom.co.nz" type="internet" plan="contract">
 				<name>XT mobile (Internet with Firewall)</name>
 			</apn>
-			<apn value="direct.telecom.co.nz">
+			<apn value="direct.telecom.co.nz" type="internet" plan="contract">
 				<name>XT mobile (Direct Internet)</name>
 			</apn>
-			<apn value="oa.telecom.co.nz">
+			<apn value="oa.telecom.co.nz" type="internet" plan="contract">
 				<name>XT mobile (One Office/Remote Office)</name>
 			</apn>
 		</gsm>
@@ -5155,15 +5155,15 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="530" mnc="01"/>
-			<apn value="live.vodafone.com">
+			<apn value="live.vodafone.com" type="internet" plan="contract">
 				<name>WAP</name>
 				<dns>202.73.206.16</dns>
 				<dns>202.73.198.16</dns>
 			</apn>
-			<apn value="www.vodafone.net.nz">
+			<apn value="www.vodafone.net.nz" type="internet" plan="contract">
 				<name>Contract / Prepaid (Restricted)</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Unrestricted (public)</name>
 				<dns>202.73.206.16</dns>
 				<dns>202.73.198.16</dns>
@@ -5178,14 +5178,14 @@ conceived.
 		<name>Oman Mobile</name>
 		<gsm>
 			<network-id mcc="422" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Nawras</name>
 		<gsm>
 			<network-id mcc="422" mnc="03"/>
-			<apn value="isp.nawras.com.om"/>
+			<apn value="isp.nawras.com.om" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -5196,7 +5196,7 @@ conceived.
 		<name>Cable and Wireless</name>
 		<gsm>
 			<network-id mcc="714" mnc="01"/>
-			<apn value="apn01.cwpanama.com.pa">
+			<apn value="apn01.cwpanama.com.pa" type="internet" plan="contract">
 			</apn>
 		</gsm>
 	</provider>
@@ -5204,7 +5204,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="714" mnc="02"/>
-			<apn value="internet.movistar.pa">
+			<apn value="internet.movistar.pa" type="internet" plan="contract">
 				<username>movistarpa</username>
 				<password>movistarpa</password>
 				<dns>200.39.10.1</dns>
@@ -5220,7 +5220,7 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="716" mnc="10"/>
-			<apn value="tim.pe">
+			<apn value="tim.pe" type="internet" plan="contract">
 				<username>tim</username>
 				<password>tulibertad</password>
 			</apn>
@@ -5230,7 +5230,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="716" mnc="06"/>
-			<apn value="movistar.pe">
+			<apn value="movistar.pe" type="internet" plan="contract">
 				<username>movistar@datos</username>
 				<password>movistar</password>
 			</apn>
@@ -5244,7 +5244,7 @@ conceived.
 		<name>Vini</name>
 		<gsm>
 			<network-id mcc="547" mnc="20"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -5255,21 +5255,21 @@ conceived.
 		<name>Globe Telecom</name>
 		<gsm>
 			<network-id mcc="515" mnc="02"/>
-			<apn value="internet.globe.com.ph">
+			<apn value="internet.globe.com.ph" type="internet" plan="contract">
 				<name>Postpaid</name>
 				<username>globe</username>
 				<password>globe</password>
 				<dns>203.127.225.10</dns>
 				<dns>203.127.225.11</dns>
 			</apn>
-			<apn value="http.globe.com.ph" type="prepaid">
+			<apn value="http.globe.com.ph" type="internet" plan="prepaid">
 				<name>Prepaid</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">
+			<apn value="www.globe.com.ph" type="internet" plan="contract">
 				<name>WAP</name>
 				<username>globe</username>
 				<password>globe</password>
@@ -5282,7 +5282,7 @@ conceived.
 		<name>Smart</name>
 		<gsm>
 			<network-id mcc="515" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>witsductoor</username>
 				<password>banonoy</password>
 				<dns>202.57.96.3</dns>
@@ -5294,7 +5294,7 @@ conceived.
 		<name>Digitel (Sun Cellular)</name>
 		<gsm>
 			<network-id mcc="515" mnc="05"/>
-			<apn value="minternet"/>
+			<apn value="minternet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -5305,7 +5305,7 @@ conceived.
 		<name>Djuice</name>
 		<gsm>
 			<network-id mcc="515" mnc="06"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>telenor</username>
 				<password>telenor</password>
 			</apn>
@@ -5315,10 +5315,10 @@ conceived.
 		<name>Mobilink</name>
 		<gsm>
 			<network-id mcc="515" mnc="01"/>
-			<apn value="connect.mobilinkworld.com">
+			<apn value="connect.mobilinkworld.com" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
-			<apn value="jazzconnect.mobilinkworld.com">
+			<apn value="jazzconnect.mobilinkworld.com" type="internet" plan="contract">
 				<name>Jazz</name>
 			</apn>
 		</gsm>
@@ -5327,7 +5327,7 @@ conceived.
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="515" mnc="06"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>telenor</username>
 				<password>telenor</password>
 			</apn>
@@ -5337,7 +5337,7 @@ conceived.
 		<name>Ufone</name>
 		<gsm>
 			<network-id mcc="410" mnc="03"/>
-			<apn value="ufone.internet">
+			<apn value="ufone.internet" type="internet" plan="contract">
 				<username>ufone</username>
 				<password>ufone</password>
 			</apn>
@@ -5347,14 +5347,14 @@ conceived.
 		<name>Warid</name>
 		<gsm>
 			<network-id mcc="515" mnc="07"/>
-			<apn value="warid"/>
+			<apn value="warid" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>ZONG</name>
 		<gsm>
 			<network-id mcc="515" mnc="04"/>
-			<apn value="zonginternet"/>
+			<apn value="zonginternet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -5365,7 +5365,7 @@ conceived.
 		<name>ERA</name>
 		<gsm>
 			<network-id mcc="260" mnc="02"/>
-			<apn value="erainternet">
+			<apn value="erainternet" type="internet" plan="contract">
 				<username>erainternet</username>
 				<password>erainternet</password>
 				<dns>213.158.194.1</dns>
@@ -5377,14 +5377,14 @@ conceived.
 		<name>Play Online</name>
 		<gsm>
 			<network-id mcc="260" mnc="06"/>
-			<apn value="Internet"/>
+			<apn value="Internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Heyah</name>
 		<gsm>
 			<network-id mcc="260" mnc="02"/>
-			<apn value="heyah.pl">
+			<apn value="heyah.pl" type="internet" plan="contract">
 				<username>heyah</username>
 				<password>heyah</password>
 				<dns>213.158.194.1</dns>
@@ -5396,7 +5396,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="260" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>internet</username>
 				<password>internet</password>
 				<dns>194.9.223.79</dns>
@@ -5408,7 +5408,7 @@ conceived.
 		<name>iPlus</name>
 		<gsm>
 			<network-id mcc="260" mnc="01"/>
-			<apn value="www.plusgsm.pl">
+			<apn value="www.plusgsm.pl" type="internet" plan="contract">
 				<dns>212.2.96.51</dns>
 				<dns>212.2.96.52</dns>
 			</apn>
@@ -5418,7 +5418,7 @@ conceived.
 		<name>GaduAIR</name>
 		<gsm>
 			<network-id mcc="260" mnc="01"/>
-			<apn value="internet.gadu-gadu.pl"/>
+			<apn value="internet.gadu-gadu.pl" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -5429,18 +5429,18 @@ conceived.
 		<name>Kanguru</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="kanguru-portatil">
+			<apn value="kanguru-portatil" type="internet" plan="contract">
 				<name>Portable</name>
 				<name xml:lang="pt">Portátil</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
-			<apn value="kanguru-tempo" type="prepaid">
+			<apn value="kanguru-tempo" type="internet" plan="prepaid">
 				<name>Tempo (Prepaid)</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
-			<apn value="kangurufixo">
+			<apn value="kangurufixo" type="internet" plan="contract">
 				<name>Fixo</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
@@ -5452,17 +5452,17 @@ conceived.
 		<name>Clix</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="clixinternetmovel"/>
+			<apn value="clixinternetmovel" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Optimus</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="umts">
+			<apn value="umts" type="internet" plan="contract">
 				<name>3G</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>GPRS</name>
 				<dns>194.79.69.129</dns>
 			</apn>
@@ -5472,7 +5472,7 @@ conceived.
 		<name>TMN</name>
 		<gsm>
 			<network-id mcc="268" mnc="06"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>tmn</username>
 				<password>tmn</password>
 				<dns>194.65.3.20</dns>
@@ -5484,7 +5484,7 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
-			<apn value="internet.vodafone.pt">
+			<apn value="internet.vodafone.pt" type="internet" plan="contract">
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
@@ -5494,7 +5494,7 @@ conceived.
 		<name>ZON</name>
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
-			<apn value="internet.zon.pt">
+			<apn value="internet.zon.pt" type="internet" plan="contract">
 			</apn>
 		</gsm>
 	</provider>
@@ -5506,24 +5506,24 @@ conceived.
 		<name>VOX</name>
 		<gsm>
 			<network-id mcc="744" mnc="01"/>
-			<apn value="vox.wap"></apn>
+			<apn value="vox.wap" type="internet" plan="contract"></apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Personal</name>
 		<gsm>
 			<network-id mcc="744" mnc="05"/>
-			<apn value="internet"></apn>
+			<apn value="internet" type="internet" plan="contract"></apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="744" mnc="04"/>
-			<apn value="internet.tigo.py">
+			<apn value="internet.tigo.py" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
-			<apn value="broadband.tigo.py">
+			<apn value="broadband.tigo.py" type="internet" plan="contract">
 				<name>Broadband</name>
 				<name xml:lang="es">Banda Ancha Móvil</name>
 				<username>tigo</username>
@@ -5535,7 +5535,7 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="744" mnc="02"/>
-			<apn value="gprs.claro.com.py">
+			<apn value="gprs.claro.com.py" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -5548,10 +5548,10 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="427" mnc="02"/>
-			<apn value="vodafone.com.qa">
+			<apn value="vodafone.com.qa" type="internet" plan="contract">
 				<name>Web (old)</name>
 			</apn>
-			<apn value="web.vodafone.com.qa">
+			<apn value="web.vodafone.com.qa" type="internet" plan="contract">
 				<name>Web</name>
 			</apn>
 		</gsm>
@@ -5560,7 +5560,7 @@ conceived.
 		<name>Q-Tel</name>
 		<gsm>
 			<network-id mcc="427" mnc="01"/>
-			<apn value="gprs.qtel">
+			<apn value="gprs.qtel" type="internet" plan="contract">
 				<name>Qatarnet</name>
 				<username>gprs</username>
 				<password>gprs</password>
@@ -5575,16 +5575,16 @@ conceived.
 		<name>SFR Réunion</name>
 		<gsm>
 			<network-id mcc="647" mnc="10"/>
-			<apn value="websfr">
+			<apn value="websfr" type="internet" plan="contract">
 				<name>Contract / Prepaid</name>
 			</apn>
-			<apn value="slsfr">
+			<apn value="slsfr" type="internet" plan="contract">
 				<name>SFR slsfr</name>
 			</apn>
-			<apn value="internetpro">
+			<apn value="internetpro" type="internet" plan="contract">
 				<name>SFR internetpro</name>
 			</apn>
-			<apn value="ipnet">
+			<apn value="ipnet" type="internet" plan="contract">
 				<name>SFR ipnet</name>
 			</apn>
 		</gsm>
@@ -5597,7 +5597,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="226" mnc="10"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>172.22.7.21</dns>
 				<dns>172.22.7.20</dns>
 			</apn>
@@ -5607,27 +5607,27 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="226" mnc="01"/>
-			<apn value="tobe.vodafone.ro">
+			<apn value="tobe.vodafone.ro" type="internet" plan="contract">
 				<name>Mobile Internet (Prepaid)</name>
 				<username>tobe.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="internet.vodafone.ro">
+			<apn value="internet.vodafone.ro" type="internet" plan="contract">
 				<name>Mobile Internet (Postpaid)</name>
 				<username>internet.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="internet.pre.vodafone.ro" type="prepaid">
+			<apn value="internet.pre.vodafone.ro" type="internet" plan="prepaid">
 				<name>Mobile Internet (Prepaid)</name>
 				<username>internet.pre.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="live.vodafone.com">
+			<apn value="live.vodafone.com" type="internet" plan="contract">
 				<name>Live! (Postpaid)</name>
 				<username>live</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="live.pre.vodafone.ro" type="prepaid">
+			<apn value="live.pre.vodafone.ro" type="internet" plan="prepaid">
 				<name>Live! (Prepaid)</name>
 				<username>live.pre.vodafone.com</username>
 				<password>vodafone</password>
@@ -5645,10 +5645,10 @@ conceived.
 		<name>Digi.Net Mobil</name>
 		<gsm>
 			<network-id mcc="226" mnc="05"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Home</name>
 			</apn>
-			<apn value="static">
+			<apn value="static" type="internet" plan="contract">
 				<name>Business (static)</name>
 			</apn>
 		</gsm>
@@ -5661,7 +5661,7 @@ conceived.
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="220" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>telenor</username>
 				<password>gprs</password>
 			</apn>
@@ -5671,7 +5671,7 @@ conceived.
 		<name>Telekom Srbija</name>
 		<gsm>
 			<network-id mcc="220" mnc="03"/>
-			<apn value="gprsinternet">
+			<apn value="gprsinternet" type="internet" plan="contract">
 				<username>mts</username>
 				<password>064</password>
 				<dns>195.178.38.3</dns>
@@ -5682,7 +5682,7 @@ conceived.
 		<name>VIP Mobile</name>
 		<gsm>
 			<network-id mcc="220" mnc="05"/>
-			<apn value="vipmobile">
+			<apn value="vipmobile" type="internet" plan="contract">
 				<username>vipmobile</username>
 				<password>vipmobile</password>
 			</apn>
@@ -5696,7 +5696,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="635" mnc="10"/>
-			<apn value="internet.mtn">
+			<apn value="internet.mtn" type="internet" plan="contract">
 			</apn>
 		</gsm>
 	</provider>
@@ -5709,7 +5709,7 @@ conceived.
 		<name xml:lang="ru">Ð?айкалÐ?еÑ?Ñ?Ð?ом</name>
 		<gsm>
 			<network-id mcc="250" mnc="12"/>
-			<apn value="inet.bwc.ru">
+			<apn value="inet.bwc.ru" type="internet" plan="contract">
 				<username>bwc</username>
 				<password>bwc</password>
 				<dns>81.18.113.2</dns>
@@ -5723,7 +5723,7 @@ conceived.
 		<gsm>
 			<network-id mcc="250" mnc="28"/>
 			<network-id mcc="250" mnc="99"/>
-			<apn value="internet.beeline.ru">
+			<apn value="internet.beeline.ru" type="internet" plan="contract">
 				<username>beeline</username>
 				<password>beeline</password>
 				<dns>217.118.66.243</dns>
@@ -5735,14 +5735,14 @@ conceived.
 		<name>ETK</name>
 		<gsm>
 			<network-id mcc="250" mnc="05"/>
-			<apn value="wap.etk.ru"/>
+			<apn value="wap.etk.ru" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MTS</name>
 		<gsm>
 			<network-id mcc="250" mnc="01"/>
-			<apn value="internet.mts.ru">
+			<apn value="internet.mts.ru" type="internet" plan="contract">
 				<username>mts</username>
 				<password>mts</password>
 				<dns>213.87.0.1</dns>
@@ -5757,59 +5757,59 @@ conceived.
 		<gsm>
 			<network-id mcc="250" mnc="02"/>
 
-			<apn value="internet.nw">
+			<apn value="internet.nw" type="internet" plan="contract">
 				<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">
+			<apn value="internet.ugsm" type="internet" plan="contract">
 				<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">
+			<apn value="internet.usi.ru" type="internet" plan="contract">
 				<name>usi</name>
 				<dns>212.120.160.130</dns>
 				<dns>212.120.160.130</dns>
 			</apn>
-			<apn value="internet.dv">
+			<apn value="internet.dv" type="internet" plan="contract">
 				<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">
+			<apn value="internet.kvk" type="internet" plan="contract">
 				<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">
+			<apn value="internet.ltmsk" type="internet" plan="contract">
 				<name>ltmsk</name>
 				<dns>10.22.10.20</dns>
 				<dns>10.22.10.21</dns>
 			</apn>
-			<apn value="internet.sib">
+			<apn value="internet.sib" type="internet" plan="contract">
 				<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">
+			<apn value="internet.volga" type="internet" plan="contract">
 				<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">
+			<apn value="internet.mc" type="internet" plan="contract">
 				<name>mc</name>
 				<name xml:lang="ru">ЦенÑ?Ñ?</name>
 				<dns>81.18.129.252</dns>
 				<dns>217.150.34.1</dns>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Moscow</name>
 				<name xml:lang="ru">Ð?оÑ?ква</name>
 				<username>gdata</username>
@@ -5821,7 +5821,7 @@ conceived.
 		<name>NCC</name>
 		<gsm>
 			<network-id mcc="250" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>ncc</username>
 				<dns>10.0.3.5</dns>
 				<dns>10.0.3.2</dns>
@@ -5832,7 +5832,7 @@ conceived.
 		<name>NTC</name>
 		<gsm>
 			<network-id mcc="250" mnc="16"/>
-			<apn value="internet.ntc">
+			<apn value="internet.ntc" type="internet" plan="contract">
 				<dns>80.243.64.67</dns>
 				<dns>80.243.68.34</dns>
 			</apn>
@@ -5843,7 +5843,7 @@ conceived.
 		<name xml:lang="ru">Ð?ниÑ?ей Телеком</name>
 		<gsm>
 			<network-id mcc="250" mnc="05"/>
-			<apn value="internet.etk.ru">
+			<apn value="internet.etk.ru" type="internet" plan="contract">
 				<username>etk</username>
 				<dns>10.10.30.3</dns>
 				<dns>10.10.30.4</dns>
@@ -5855,7 +5855,7 @@ conceived.
 		<name xml:lang="ru">Ð?оÑ?ив</name>
 		<gsm>
 			<network-id mcc="250" mnc="35"/>
-			<apn value="inet.ycc.ru">
+			<apn value="inet.ycc.ru" type="internet" plan="contract">
 				<username>motiv</username>
 				<dns>217.148.52.34</dns>
 				<dns>217.148.52.3</dns>
@@ -5866,7 +5866,7 @@ conceived.
 		<name>Tatincom</name>
 		<name xml:lang="ru">ТаÑ?инком</name>
 		<gsm>
-			<apn value="internet.tatincom.ru">
+			<apn value="internet.tatincom.ru" type="internet" plan="contract">
 				<username>tatincom</username>
 				<password>tatincom</password>
 				<dns>89.207.96.2</dns>
@@ -5879,7 +5879,7 @@ conceived.
 		<name xml:lang="ru">Теле2</name>
 		<gsm>
 			<network-id mcc="250" mnc="20"/>
-			<apn value="internet.tele2.ru">
+			<apn value="internet.tele2.ru" type="internet" plan="contract">
 				<dns>130.244.127.161</dns>
 				<dns>130.244.127.169</dns>
 			</apn>
@@ -5990,7 +5990,7 @@ conceived.
 		<name>U-tel</name>
 		<gsm>
 			<network-id mcc="250" mnc="39"/>
-			<apn value="internet.usi.ru"/>
+			<apn value="internet.usi.ru" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -6001,10 +6001,10 @@ conceived.
 		<name>Mobily</name>
 		<gsm>
 			<network-id mcc="420" mnc="03"/>
-			<apn value="web1">
+			<apn value="web1" type="internet" plan="contract">
 				<name>Postpaid</name>
 			</apn>
-			<apn value="web2" type="prepaid">
+			<apn value="web2" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -6013,7 +6013,7 @@ conceived.
 		<name>STC</name>
 		<gsm>
 			<network-id mcc="420" mnc="01"/>
-			<apn value="jawalnet.com.sa">
+			<apn value="jawalnet.com.sa" type="internet" plan="contract">
 				<dns>212.118.133.101</dns>
 				<dns>212.118.133.102</dns>
 			</apn>
@@ -6023,7 +6023,7 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="420" mnc="04"/>
-			<apn value="zain"/>
+			<apn value="zain" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -6037,14 +6037,14 @@ conceived.
 			<network-id mcc="240" mnc="02"/>
 			<network-id mcc="240" mnc="04"/>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
-			<apn value="data.tre.se">
+			<apn value="data.tre.se" type="internet" plan="contract">
 				<name>Mobiltelefon</name>
 			</apn>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
-			<apn value="bredband.tre.se">
+			<apn value="bredband.tre.se" type="internet" plan="contract">
 				<name>Bredband</name>
 			</apn>
-			<apn value="net.tre.se">
+			<apn value="net.tre.se" type="internet" plan="contract">
 				<name>Bredband Kontantkort</name>
 			</apn>
 		</gsm>
@@ -6054,11 +6054,11 @@ conceived.
 		<gsm>
 			<network-id mcc="240" mnc="08"/>
 			<!-- http://glocalnet.se/mobiltbredband -->
-			<apn value="bredband.glocalnet.se">
+			<apn value="bredband.glocalnet.se" type="internet" plan="contract">
 				<name>Mobilt Bredband</name>
 			</apn>
 			<!-- http://kundservice.glocalnet.se/Kundservice/Mobiltelefoni/Installningar/ -->
-			<apn value="internet.glocalnet.se">
+			<apn value="internet.glocalnet.se" type="internet" plan="contract">
 				<name>Glocalnet Internet</name>
 			</apn>
 		</gsm>
@@ -6069,7 +6069,7 @@ conceived.
 			<network-id mcc="240" mnc="01"/>
 
 			<!-- http://www.halebop.se/halebop_kundtjanst/vanliga_fragor_kontantkort/ -->
-			<apn value="halebop.telia.se"/>
+			<apn value="halebop.telia.se" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6090,11 +6090,11 @@ conceived.
 				<dtmf>211</dtmf>
 			</balance-check>
 			<!-- http://www.tele2.se/internet-via-gprs.html -->
-			<apn value="internet.tele2.se">
+			<apn value="internet.tele2.se" type="internet" plan="contract">
 				<name>Mobilt Internet</name>
 			</apn>
 			<!-- http://www.tele2.se/alien-modem.html -->
-			<apn value="mobileinternet.tele2.se">
+			<apn value="mobileinternet.tele2.se" type="internet" plan="contract">
 				<name>Mobilt Bredband</name>
 			</apn>
 		</gsm>
@@ -6104,7 +6104,7 @@ conceived.
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
 			<network-id mcc="240" mnc="05"/>
-			<apn value="data.comviq.se">
+			<apn value="data.comviq.se" type="internet" plan="contract">
 				<name>Surf</name>
 			</apn>
 		</gsm>
@@ -6116,7 +6116,7 @@ conceived.
 			<network-id mcc="240" mnc="05"/>
 			
 			<!-- http://multicomsecurity.se/produkter-tjanster/mobil-datakommunikation/mobiflex/ -->
-			<apn value="mobiflex.telia.se">
+			<apn value="mobiflex.telia.se" type="internet" plan="contract">
 				<name>Mobiflex</name>
 			</apn>
 		</gsm>
@@ -6129,13 +6129,13 @@ conceived.
 			<network-id mcc="240" mnc="08"/>
 
 			<!-- http://www.telenor.se/privat/mobiltelefoni/alla-mobiltjanster/alla-mobiltjanster.html#C45-2100 -->
-			<apn value="internet.telenor.se">
+			<apn value="internet.telenor.se" type="internet" plan="contract">
 				<name>Mobilt Internet</name>
 			</apn>
-			<apn value="services.telenor.se">
+			<apn value="services.telenor.se" type="internet" plan="contract">
 				<name>Mobilsurf med maxtaxa</name>
 			</apn>
-			<apn value="bredband.telenor.se">
+			<apn value="bredband.telenor.se" type="internet" plan="contract">
 				<name>Mobilt Bredband</name>
 			</apn>
 		</gsm>
@@ -6150,21 +6150,21 @@ conceived.
 				<ussd>*121#</ussd>
 			</balance-check>
 			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
-			<apn value="online.telia.se"/>
+			<apn value="online.telia.se" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="240" mnc="14"/>
-			<apn value="internet.se"/>
+			<apn value="internet.se" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>djuice</name>
 		<gsm>
 			<network-id mcc="240" mnc="09"/>
-			<apn value="internet.djuice.se"/>
+			<apn value="internet.djuice.se" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6173,25 +6173,25 @@ conceived.
 			<network-id mcc="240" mnc="02"/>
 			<network-id mcc="240" mnc="04"/>
 			<!-- MVNO operating on 3's network -->
-			<apn value="bredband.comhem.se"/>
+			<apn value="bredband.comhem.se" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Parlino</name>
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
-			<apn value="internet.parlino.se"/>
+			<apn value="internet.parlino.se" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Universal Telecom</name>
 		<gsm>
 			<!-- http://www.uvtc.com/SWEDEN/internet/mobiltbredband/Default.aspx -->
-			<apn value="sp-internet">
+			<apn value="sp-internet" type="internet" plan="contract">
 				<name>Mobilt Bredband</name>
 			</apn>
 			<!-- http://www.uvtc.com/sweden/Mobil/Faq/default.aspx -->
-			<apn value="internet.uvtc.com">
+			<apn value="internet.uvtc.com" type="internet" plan="contract">
 				<name>Mobilt Internet</name>
 			</apn>
 		</gsm>
@@ -6205,26 +6205,26 @@ conceived.
 		<gsm>
 			<network-id mcc="525" mnc="03"/>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html mid page -->
-			<apn value="sunsurf">
+			<apn value="sunsurf" type="internet" plan="contract">
 				<name>SunSurf/Mobile Broadband (postpaid)</name>
 				<username>65</username>
 			</apn>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html top page-->
-			<apn value="miworld">
+			<apn value="miworld" type="internet" plan="contract">
 				<name>MiWorld Mobile (postpaid)</name>
 				<username>65(mobilenumber)</username>
 				<password>user123</password>
 			</apn>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html lower page -->
-			<apn value="miworldcard" type="prepaid">
+			<apn value="miworldcard" type="internet" plan="prepaid">
 				<name>MiWorld Mobile (prepaid)</name>
 				<username>65(mobilenumber)</username>
 				<password>user123</password>
 			</apn>
-			<apn value="prepaidbb" type="prepaid">
+			<apn value="prepaidbb" type="internet" plan="prepaid">
 				<name>Mobile Broadband (prepaid)</name>
 			</apn>
-			<apn value="sunsurfmcard" type="prepaid">
+			<apn value="sunsurfmcard" type="internet" plan="prepaid">
 				<name>M Card (prepaid)</name>
 			</apn>
 		</gsm>
@@ -6234,7 +6234,7 @@ conceived.
 		<gsm>
 			<network-id mcc="525" mnc="01"/>
 			<network-id mcc="525" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>165.21.100.88</dns>
 				<dns>165.21.83.88</dns>
 			</apn>
@@ -6244,16 +6244,16 @@ conceived.
 		<name>Starhub</name>
 		<gsm>
 			<network-id mcc="525" mnc="05"/>
-			<apn value="shwap" type="wap">
+			<apn value="shwap" type="wap" plan="contract">
 				<name>WAP</name>
 				<username>star</username>
 				<password>hub</password>
 				<dns>203.116.1.78</dns>
 			</apn>
-			<apn value="shppd" type="prepaid">
+			<apn value="shppd" type="internet" plan="prepaid">
 				<name>MaxMobile Broadband (prepaid)</name>
 			</apn>
-			<apn value="shinternet">
+			<apn value="shinternet" type="internet" plan="contract">
 				<name>MaxMobile Broadband (postpaid)</name>
 			</apn>
 		</gsm>
@@ -6267,14 +6267,14 @@ conceived.
 		<gsm>
 			<network-id mcc="293" mnc="41"/>
 
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<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">
+			<apn value="internetpro" type="internet" plan="contract">
 				<username>mobitel</username>
 				<password>internet</password>
 				<dns>213.229.248.161</dns>
@@ -6286,7 +6286,7 @@ conceived.
 		<name>Vodafone / Simobil</name>
 		<gsm>
 			<network-id mcc="293" mnc="40"/>
-			<apn value="internet.simobil.si">
+			<apn value="internet.simobil.si" type="internet" plan="contract">
 				<username>simobil</username>
 				<password>internet</password>
 			</apn>
@@ -6296,7 +6296,7 @@ conceived.
 		<name>T-2</name>
 		<gsm>
 			<network-id mcc="293" mnc="64"/>
-			<apn value="internet.t-2.net"/>
+			<apn value="internet.t-2.net" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -6308,7 +6308,7 @@ conceived.
 		<gsm>
 			<network-id mcc="231" mnc="02"/>
 			<network-id mcc="231" mnc="04"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>194.154.230.66</dns>
 				<dns>194.154.230.74</dns>
 			</apn>
@@ -6318,7 +6318,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="231" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>213.151.200.30</dns>
 				<dns>213.151.208.161</dns>
 			</apn>
@@ -6328,7 +6328,7 @@ conceived.
 		<name>O2</name>
 		<gsm>
 			<network-id mcc="231" mnc="06"/>
-			<apn value="o2internet">
+			<apn value="o2internet" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -6341,7 +6341,7 @@ conceived.
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="608" mnc="02"/>
-			<apn value="wap.sentelgsm.com">
+			<apn value="wap.sentelgsm.com" type="internet" plan="contract">
 				<dns>200.85.0.104</dns>
 				<dns>200.85.0.107</dns>
 			</apn>
@@ -6355,7 +6355,7 @@ conceived.
 		<name>movistar</name>
 		<gsm>
 			<network-id mcc="706" mnc="04"/>
-			<apn value="internet.movistar.sv">
+			<apn value="internet.movistar.sv" type="internet" plan="contract">
 				<username>movistarsv</username>
 				<password>movistarsv</password>
 			</apn>
@@ -6365,21 +6365,21 @@ conceived.
 		<name>digicel</name>
 		<gsm>
 			<network-id mcc="706" mnc="02"/>
-			<apn value="wap.digicelsv.com"/>
+			<apn value="wap.digicelsv.com" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="706" mnc="03"/>
-			<apn value="internet.tigo.sv"/>
+			<apn value="internet.tigo.sv" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="706" mnc="10"/>
-			<apn value="internet.ideasclaro">
+			<apn value="internet.ideasclaro" type="internet" plan="contract">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -6392,7 +6392,7 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="634" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -6403,7 +6403,7 @@ conceived.
 		<name>AIS</name>
 		<gsm>
 			<network-id mcc="520" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>202.183.255.20</dns>
 				<dns>202.183.255.21</dns>
 			</apn>
@@ -6413,7 +6413,7 @@ conceived.
 		<name>DTAC</name>
 		<gsm>
 			<network-id mcc="520" mnc="18"/>
-			<apn value="www.dtac.co.th">
+			<apn value="www.dtac.co.th" type="internet" plan="contract">
 				<dns>202.44.202.2</dns>
 				<dns>203.44.144.33</dns>
 			</apn>
@@ -6423,7 +6423,7 @@ conceived.
 		<name>True Move</name>
 		<gsm>
 			<network-id mcc="520" mnc="99"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>true</username>
 				<password>true</password>
 			</apn>
@@ -6433,7 +6433,7 @@ conceived.
 		<name>TOT 3G</name>
 		<gsm>
 			<network-id mcc="520" mnc="15"/>
-			<apn value="internet" />
+			<apn value="internet" type="internet" plan="contract" />
 		</gsm>
 	</provider>
 </country>
@@ -6444,10 +6444,10 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="605" mnc="01"/>
-			<apn value="keygp" type="prepaid">
+			<apn value="keygp" type="internet" plan="prepaid">
 				<name>Internet Everywhere Prepaid</name>
 			</apn>
-			<apn value="keypro">
+			<apn value="keypro" type="internet" plan="contract">
 				<name>Internet Everywhere Professional</name>
 			</apn>
 		</gsm>
@@ -6461,12 +6461,12 @@ conceived.
 		<gsm>
 			<network-id mcc="286" mnc="03"/>
 			<network-id mcc="286" mnc="04"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>212.156.4.4</dns>
 				<dns>212.156.4.20</dns>
 			</apn>
 
-			<apn value="aycell">
+			<apn value="aycell" type="internet" plan="contract">
 				<name>(former Aycell)</name>
 				<dns>212.156.4.1</dns>
 				<dns>212.156.4.4</dns>
@@ -6477,7 +6477,7 @@ conceived.
 		<name>Turkcell</name>
 		<gsm>
 			<network-id mcc="286" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>gprs</username>
 				<password>gprs</password>
 				<dns>86.108.136.27</dns>
@@ -6489,22 +6489,22 @@ conceived.
 		<name>Vodafone / KKTC Telsim</name>
 		<gsm>
 			<network-id mcc="286" mnc="02"/><!-- mnc="0251" in Vodofone XML -->
-			<apn value="edje.kktctelsim.com">
+			<apn value="edje.kktctelsim.com" type="internet" plan="contract">
 				<name>Faturali / Kontorlu</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>KKTC Telsim</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="telsim">
+			<apn value="telsim" type="internet" plan="contract">
 				<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" type="prepaid">
+			<apn value="prepaidgprs" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<dns>212.65.128.20</dns>
 				<dns>212.156.4.7</dns>
@@ -6519,7 +6519,7 @@ conceived.
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="374" mnc="13"/>
-			<apn value="wap.digiceltt.com">
+			<apn value="wap.digiceltt.com" type="internet" plan="contract">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -6529,7 +6529,7 @@ conceived.
 		<name>bmobile / TSTT</name>
 		<gsm>
 			<network-id mcc="374" mnc="12"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -6545,9 +6545,9 @@ conceived.
 		<gsm>
 			<network-id mcc="466" mnc="92"/>
 			<!-- http://www.nav4all.com/site2/www.nav4all.com/enguk/gprs_settings_taiwan_chunghwatelekom_nav4all.php?m=F3 -->
-			<apn value="emome"/>
+			<apn value="emome" type="internet" plan="contract"/>
 			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 lists username/pass = web. Others list empty -->
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6555,7 +6555,7 @@ conceived.
 		<name xml:lang="zh">é? å?³é?»ä¿¡ / å??ä¿¡é?»è¨?</name>
 		<gsm>
 			<network-id mcc="466" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6563,7 +6563,7 @@ conceived.
 		<name xml:lang="zh">�湾大�大</name>
 		<gsm>
 			<network-id mcc="466" mnc="99"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6571,7 +6571,7 @@ conceived.
 		<name xml:lang="zh">���信</name>
 		<gsm>
 			<network-id mcc="466" mnc="97"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6579,7 +6579,7 @@ conceived.
 		<name xml:lang="zh">å¨?寶é?»ä¿¡ (Vibo) / é??æ?¦é?»ä¿¡ (Aurora)</name>
 		<gsm>
 			<network-id mcc="466" mnc="89"/>
-			<apn value="vibo"/>
+			<apn value="vibo" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6595,21 +6595,21 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="640" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="640" mnc="04"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Zantel</name>
 		<gsm>
 			<network-id mcc="640" mnc="03"/>
-			<apn value="znet"/>
+			<apn value="znet" type="internet" plan="contract"/>
 		</gsm>
 		<cdma>
 			<username>@zantel.com</username>
@@ -6638,15 +6638,15 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="03"/>
 
-			<apn value="www.ab.kyivstar.net">
+			<apn value="www.ab.kyivstar.net" type="internet" plan="contract">
 				<name>Ace&amp;Base</name>
 				<username>igprs</username>
 				<password>internet</password>
 			</apn>
-			<apn value="www.kyivstar.net">
+			<apn value="www.kyivstar.net" type="internet" plan="contract">
 				<name>Contract GPRS</name>
 			</apn>
-			<apn value="3g.kyivstar.net">
+			<apn value="3g.kyivstar.net" type="internet" plan="contract">
 				<name>Internet 3G</name>
 			</apn>
 		</gsm>
@@ -6656,13 +6656,13 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="03"/>
 
-			<apn value="www.djuice.com.ua">
+			<apn value="www.djuice.com.ua" type="internet" plan="contract">
 				<name>Internet GPRS</name>
 			</apn>
-			<apn value="xl.kyivstar.net">
+			<apn value="xl.kyivstar.net" type="internet" plan="contract">
 				<name>Internet XL</name>
 			</apn>
-			<apn value="3g.kyivstar.net">
+			<apn value="3g.kyivstar.net" type="internet" plan="contract">
 				<name>Internet 3G</name>
 			</apn>
 		</gsm>
@@ -6672,12 +6672,12 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="06"/>
 
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>Standard</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
-			<apn value="speed">
+			<apn value="speed" type="internet" plan="contract">
 				<name>Faster</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
@@ -6688,18 +6688,18 @@ conceived.
 		<name>Beeline</name>
 		<gsm>
 			<network-id mcc="255" mnc="02"/>
-			<apn value="internet.beeline.ua"/>
+			<apn value="internet.beeline.ua" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Jeans</name>
 		<gsm>
 			<network-id mcc="255" mnc="01"/>
-			<apn value="www.jeans.ua">
+			<apn value="www.jeans.ua" type="internet" plan="contract">
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
 			</apn>
-			<apn value="hyper.net">
+			<apn value="hyper.net" type="internet" plan="contract">
 				<name>Hyper.NET</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
@@ -6711,19 +6711,19 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="01"/>
 
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<name>GPRS Internet</name>
 				<username>internet</username>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
-			<apn value="hyper.net">
+			<apn value="hyper.net" type="internet" plan="contract">
 				<name>Hyper.NET</name>
 			</apn>
-			<apn value="active">
+			<apn value="active" type="internet" plan="contract">
 				<name>HyperActive</name>
 			</apn>
-			<apn value="www.umc.ua">
+			<apn value="www.umc.ua" type="internet" plan="contract">
 				<name>umc.ua</name>
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
@@ -6740,7 +6740,7 @@ conceived.
 		<name>Utel</name>
 		<gsm>
 			<network-id mcc="255" mnc="07"/>
-			<apn value="3g.utel.ua"/>
+			<apn value="3g.utel.ua" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6770,7 +6770,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="641" mnc="10"/>
-			<apn value="yellopix.mtn.co.ug">
+			<apn value="yellopix.mtn.co.ug" type="internet" plan="contract">
 				<dns>193.108.252.50</dns>
 				<dns>193.108.252.51</dns>
 			</apn>
@@ -6780,17 +6780,17 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="641" mnc="14"/>
-			<apn value="orange.ug"/>
+			<apn value="orange.ug" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
     <provider>
 		<name>UTL</name>
 		<gsm>
 			<network-id mcc="641" mnc="11"/>
-			<apn value="utbroadband">
+			<apn value="utbroadband" type="internet" plan="contract">
 				<name>Mobile Broadband</name>
 			</apn>
-			<apn value="utweb">
+			<apn value="utweb" type="internet" plan="contract">
 				<name>Mobile Internet</name>
 			</apn>
 		</gsm>
@@ -6800,14 +6800,14 @@ conceived.
 		<gsm>
 			<network-id mcc="641" mnc="22"/>
 			<!-- http://www.waridtel.co.ug/gprs.php -->
-			<apn value="web.waridtel.co.ug"/>
+			<apn value="web.waridtel.co.ug" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
     <provider>
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="641" mnc="01"/>
-			<apn value="web.ug.zain.com"/>
+			<apn value="web.ug.zain.com" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -6824,13 +6824,13 @@ conceived.
 			<network-id mcc="310" mnc="560"/>
 			<network-id mcc="310" mnc="680"/>
 			<!-- http://www.wireless.att.com/answer-center/main.jsp?solutionId=35078&t=solutionTab -->
-			<apn value="wap.cingular">
+			<apn value="wap.cingular" type="internet" plan="contract">
 				<name>MEdia Net (phones)</name>
 			</apn>
-			<apn value="Broadband">
+			<apn value="Broadband" type="internet" plan="contract">
 				<name>LaptopConnect (data cards)</name>
 			</apn>
-			<apn value="isp.cingular">
+			<apn value="isp.cingular" type="internet" plan="contract">
 				<name>Data Connect (old)</name>
 			</apn>
 		</gsm>
@@ -6853,16 +6853,16 @@ conceived.
 			<network-id mcc="310" mnc="660"/>
 			<network-id mcc="310" mnc="800"/>
 
-			<apn value="epc.tmobile.com">
+			<apn value="epc.tmobile.com" type="internet" plan="contract">
 				<name>Internet/WebConnect</name>
 			</apn>
-			<apn value="wap.voicestream.com">
+			<apn value="wap.voicestream.com" type="internet" plan="contract">
 				<name>Web2Go/t-zones</name>
 			</apn>
-			<apn value="internet2.voicestream.com">
+			<apn value="internet2.voicestream.com" type="internet" plan="contract">
 				<name>Internet (old)</name>
 			</apn>
-			<apn value="internet3.voicestream.com">
+			<apn value="internet3.voicestream.com" type="internet" plan="contract">
 				<name>Internet with VPN (old)</name>
 			</apn>
 		</gsm>
@@ -6871,7 +6871,7 @@ conceived.
 		<name>Cincinnati Bell Wireless</name>
 		<gsm>
 			<network-id mcc="310" mnc="420"/>
-			<apn value="wap.gocbw.com">
+			<apn value="wap.gocbw.com" type="internet" plan="contract">
 				<username>cbw</username>
 			</apn>
 		</gsm>
@@ -7516,14 +7516,14 @@ conceived.
 		<name>BendBroadband</name>
 		<gsm>
 			<network-id mcc="311" mnc="570"/>
-			<apn value="ISP"/>
+			<apn value="ISP" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MTPCS (Cellular One)</name>
 		<gsm>
 			<network-id mcc="310" mnc="570"/>
-			<apn value="wapgw.chinookwireless.net"/>
+			<apn value="wapgw.chinookwireless.net" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -7541,17 +7541,17 @@ conceived.
 		<gsm>
 			<network-id mcc="748" mnc="00"/>
 			<network-id mcc="748" mnc="01"/>
-			<apn value="adslmovil">
+			<apn value="adslmovil" type="internet" plan="contract">
 				<name>ADSL Móvil</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
 			</apn>
-			<apn value="prepago.ancel" type="prepaid">
+			<apn value="prepago.ancel" type="internet" plan="prepaid">
 				<name>ADSL Móvil Prepago</name>
 				<username>BAM</username>
 				<password>BAM</password>
 			</apn>
-			<apn value="gprs.ancel">
+			<apn value="gprs.ancel" type="internet" plan="contract">
 				<name>GPRS</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
@@ -7562,12 +7562,12 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="748" mnc="10"/>
-			<apn value="gprs.claro.com.uy">
+			<apn value="gprs.claro.com.uy" type="internet" plan="contract">
 				<name>3G Internet</name>
 				<username>ctigprs</username>
 				<password>ctigprs999</password>
 			</apn>
-			<apn value="internet.ctimovil.com.uy">
+			<apn value="internet.ctimovil.com.uy" type="internet" plan="contract">
 				<name>2G Internet</name>
 				<username>ctiweb</username>
 				<password>ctiweb999</password>
@@ -7578,12 +7578,12 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="748" mnc="07"/>
-			<apn value="apnumt.movistar.com.uy">
+			<apn value="apnumt.movistar.com.uy" type="internet" plan="contract">
 				<name>3G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
-			<apn value="webapn.movistar.com.uy">
+			<apn value="webapn.movistar.com.uy" type="internet" plan="contract">
 				<name>2G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
@@ -7598,7 +7598,7 @@ conceived.
 		<name>Uzdunrobita / MTS</name>
 		<gsm>
 			<network-id mcc="434" mnc="07"/>
-			<apn value="net.urd.uz">
+			<apn value="net.urd.uz" type="internet" plan="contract">
 				<username>user</username>
 				<password>pass</password>
 			</apn>
@@ -7612,7 +7612,7 @@ conceived.
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="360" mnc="070"/>
-			<apn value="wap.digiceloecs.com">
+			<apn value="wap.digiceloecs.com" type="internet" plan="contract">
 				<username>wapoecs</username>
 				<password>wap03oecs</password>
 			</apn>
@@ -7628,7 +7628,7 @@ conceived.
 			<network-id mcc="734" mnc="01"/>
 			<network-id mcc="734" mnc="02"/>
 			<network-id mcc="734" mnc="03"/>
-			<apn value="gprsweb.digitel.ve">
+			<apn value="gprsweb.digitel.ve" type="internet" plan="contract">
 				<dns>57.67.127.195</dns>
 			</apn>
 		</gsm>
@@ -7637,7 +7637,7 @@ conceived.
 		<name>Movilnet</name>
 		<gsm>
 			<network-id mcc="734" mnc="06"/>
-			<apn value="int.movilnet.com.ve">
+			<apn value="int.movilnet.com.ve" type="internet" plan="contract">
 				<dns>200.44.32.12</dns>
 				<dns>200.11.248.12</dns>
 			</apn>
@@ -7647,7 +7647,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="734" mnc="04"/>
-			<apn value="internet.movistar.ve">
+			<apn value="internet.movistar.ve" type="internet" plan="contract">
 				<dns>200.35.65.3</dns>
 				<dns>200.35.65.4</dns>
 			</apn>
@@ -7661,7 +7661,7 @@ conceived.
 		<name>MobiFone</name>
 		<gsm>
 			<network-id mcc="452" mnc="01"/>
-			<apn value="m-wap">
+			<apn value="m-wap" type="internet" plan="contract">
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
@@ -7671,12 +7671,12 @@ conceived.
 		<name>Vinaphone</name>
 		<gsm>
 			<network-id mcc="452" mnc="02"/>
-			<apn value="m3-world">
+			<apn value="m3-world" type="internet" plan="contract">
 				<name>Mobile Internet</name>
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
-			<apn value="m3-card">
+			<apn value="m3-card" type="internet" plan="contract">
 				<name>Mobile Broadband</name>
 				<username>mms</username>
 				<password>mms</password>
@@ -7698,10 +7698,10 @@ conceived.
 		<name>Viettel Mobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="04"/>
-			<apn value="v-internet">
+			<apn value="v-internet" type="internet" plan="contract">
 				<name>Mobile Internet</name>
 			</apn>
-			<apn value="e-connect">
+			<apn value="e-connect" type="internet" plan="contract">
 				<name>D-com 3G</name>
 			</apn>
 		</gsm>
@@ -7710,14 +7710,14 @@ conceived.
 		<name>Vietnamobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>EVNTelecom/E-Mobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="08"/>
-			<apn value="e-internet">
+			<apn value="e-internet" type="internet" plan="contract">
 				<name>EVNTelecomNet</name>
 			</apn>
 		</gsm>
@@ -7730,7 +7730,7 @@ conceived.
 		<name>Beeline VN</name>
 		<gsm>
 			<network-id mcc="452" mnc="07"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
@@ -7741,7 +7741,7 @@ conceived.
 		<name>Cell-c</name>
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -7751,7 +7751,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="655" mnc="10"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="contract">
 				<dns>196.11.240.241</dns>
 				<dns>209.212.97.1</dns>
 			</apn>
@@ -7761,8 +7761,8 @@ conceived.
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="655" mnc="01"/>
-			<apn value="internet"/>
-			<apn value="unrestricted">
+			<apn value="internet" type="internet" plan="contract"/>
+			<apn value="unrestricted" type="internet" plan="contract">
 				<name>Unrestricted</name>
 				<dns>196.207.32.69</dns>
 				<dns>196.43.45.190</dns>
@@ -7773,7 +7773,7 @@ conceived.
 		<name>Virgin Mobile</name>
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
-			<apn value="vdata">
+			<apn value="vdata" type="internet" plan="contract">
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -7783,7 +7783,7 @@ conceived.
 		<name>8.ta</name>
 		<gsm>
 			<network-id mcc="655" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="contract"/>
 		</gsm>
 	</provider>
 </country>
-- 
1.7.1



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