---
 serviceproviders.xml |  460 +++++++++++++++++++++++++-------------------------
 1 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/serviceproviders.xml b/serviceproviders.xml
index 019e7f4..839c1f2 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -2638,21 +2638,21 @@ conceived.
                        <balance-check>
                                <dtmf>453</dtmf>
                        </balance-check>
-                       <apn value="orangeinternet">
+                       <apn value="orangeinternet" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>WAP</name>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Vodafone (ONEtouch)</name>
                <gsm>
                        <network-id mcc="620" mnc="02"/>
-                       <apn value="browse"/>
+                       <apn value="browse" type="internet" plan="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Vodafone</name>
                <gsm>
                        <network-id mcc="202" mnc="05"/>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <name>Contract</name>
                        </apn>
-                       <apn value="web.session">
+                       <apn value="web.session" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>SmarTone</name>
                <gsm>
                        <network-id mcc="454" mnc="06"/>
-                       <apn value="internet"/>
+                       <apn value="internet" type="internet" plan="postpaid"/>
                </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="postpaid">
                                <name>Sunday (Old)</name>
                        </apn>
-                       <apn value="pccwdata">
+                       <apn value="pccwdata" type="internet" plan="postpaid">
                                <name>PCCW 2G/GPRS</name>
                        </apn>
-                       <apn value="pccw">
+                       <apn value="pccw" type="internet" plan="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <name>Contract and Prepaid</name>
                        </apn>
-                       <apn value="gprs5.vipnet.hr">
+                       <apn value="gprs5.vipnet.hr" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>GPRS</name>
                                <username>3gprs</username>
                                <password>3gprs</password>
                        </apn>
-                       <apn value="3data">
+                       <apn value="3data" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>IM3/Mentari Time-based</name>
                                <username>indosat@durasi</username>
                                <password>indosat@durasi</password>
                        </apn>
-                       <apn value="indosatgprs">
+                       <apn value="indosatgprs" type="internet" 
plan="postpaid">
                                <name>IM3/Mentari Volume-based</name>
                                <username>indosat</username>
                                <password>indosat</password>
                        </apn>
-                       <apn value="indosatgprs">
+                       <apn value="indosatgprs" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Flash Time-based</name>
                                <username>foo</username>
                                <password>bar</password>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <username>vodafone</username>
                                <password>vodafone</password>
                        </apn>
-                       <apn value="isp.vodafone.ie">
+                       <apn value="isp.vodafone.ie" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <name>Meteor Data</name>
                                <username>my</username>
                                <password>meteor</password>
                        </apn>
-                       <apn value="broadband.mymeteor.ie">
+                       <apn value="broadband.mymeteor.ie" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Orange</name>
                <gsm>
                        <network-id mcc="425" mnc="01"/>
-                       <apn value="uinternet">
+                       <apn value="uinternet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>WAP</name>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <name>Web</name>
                        </apn>
-                       <apn value="aircelgprs.po">
+                       <apn value="aircelgprs.po" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Vodafone Connect</name>
                        </apn>
-                       <apn value="portalnmms" type="mms">
+                       <apn value="portalnmms" type="mms" plan="postpaid">
                                <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="postpaid">
                                <name>New GPRS/3G</name>
                        </apn>
 
-                       <apn value="bsnlwap" type="wap">
+                       <apn value="bsnlwap" type="wap" plan="postpaid">
                                <name>New WAP</name>
                        </apn>
 
-                       <apn value="bsnlsouth">
+                       <apn value="bsnlsouth" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Smart Net</name>
                        </apn>
-                       <apn value="smartwap" type="wap">
+                       <apn value="smartwap" type="wap" plan="postpaid">
                                <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="postpaid">
                                <username>spice</username>
                                <password>spice</password>
                        </apn>
-                       <apn value="simplydownload">
+                       <apn value="simplydownload" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                        </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="postpaid">
                        </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="postpaid">
                        </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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Mobile Internet</name>
                        </apn>
-                       <apn value="web.omnitel.it">
+                       <apn value="web.omnitel.it" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Voce/dati</name>
                        </apn>
-                       <apn value="datacard.fastweb.it">
+                       <apn value="datacard.fastweb.it" type="internet" 
plan="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <name>WAP</name>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>mopera</name>
                        </apn>
-                       <apn value="mopera.net">
+                       <apn value="mopera.net" type="internet" plan="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Mobitel</name>
                <gsm>
                        <network-id mcc="456" mnc="01"/>
-                       <apn value="3g">
+                       <apn value="3g" type="internet" plan="postpaid">
                                <name>CellCard Corporate</name>
                                <username>mobitel</username>
                                <password>mobitel</password>
                        </apn>
-                       <apn value="3gtv">
+                       <apn value="3gtv" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </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="postpaid"/>
                </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="postpaid">
                                <name>Personal</name>
                                <username>pps</username>
                                <password>pps</password>
                        </apn>
-                       <apn value="apn01">
+                       <apn value="apn01" type="internet" plan="postpaid">
                                <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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Viva</name>
                <gsm>
                        <network-id mcc="419" mnc="04"/>
-                       <apn value="viva"/>
+                       <apn value="viva" type="internet" plan="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Neo</name>
                <gsm>
                        <network-id mcc="401" mnc="77"/>
-                       <apn value="internet"/>
+                       <apn value="internet" type="internet" plan="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Mobitel</name>
                <gsm>
                        <network-id mcc="413" mnc="01"/>
-                       <apn value="isp"/>
+                       <apn value="isp" type="internet" plan="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Tigo</name>
                <gsm>
                        <network-id mcc="413" mnc="03"/>
-                       <apn value="wap"/>
+                       <apn value="wap" type="internet" plan="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>hspa</name>
                                <username>tango</username>
                                <password>tango</password>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <name>O!Karte internet</name>
                        </apn>
-                       <apn value="okarte.lmt.lv">
+                       <apn value="okarte.lmt.lv" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <name>Regular</name>
                                <username>gprs</username>
                                <password>internet</password>
                        </apn>
-                       <apn value="mobileinternet.tele2.lv">
+                       <apn value="mobileinternet.tele2.lv" type="internet" 
plan="postpaid">
                                <name>Mobile Internet</name>
                                <username>wap</username>
                                <password>wap</password>
                        </apn>
-                       <apn value="data.tele2.lv">
+                       <apn value="data.tele2.lv" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <name>Bite plus</name>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <name>Mobile Broadband</name>
                                <username>38267</username>
                                <password>38267</password>
                        </apn>
-                       <apn value="tmcg-nw">
+                       <apn value="tmcg-nw" type="internet" plan="postpaid">
                                <name>GPRS</name>
                                <username>38267</username>
                                <password>38267</password>
                        </apn>
-                       <apn value="internet-postpaid">
+                       <apn value="internet-postpaid" type="internet" 
plan="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>Wataniya</name>
                <gsm>
                        <network-id mcc="472" mnc="02"/>
-                       <apn value="WataniyaNet"/>
+                       <apn value="WataniyaNet" type="internet" 
plan="postpaid"/>
                </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="postpaid"/>
                </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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Broadband</name>
                                <username>maxis</username>
                                <password>wap</password>
                        </apn>
-                       <apn value="net">
+                       <apn value="net" type="internet" plan="postpaid">
                                <name>GPRS</name>
                                <username>maxis</username>
                                <password>net</password>
                        </apn>
-                       <apn value="unet">
+                       <apn value="unet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Tango</name>
                                <username>ppsuser</username>
                                <password>ppsuser</password>
                        </apn>
-                       <apn value="internet">
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>Pay as You Go</name>
                                <username>gprs</username>
                                <password>gprs</password>
                        </apn>
-                       <apn value="gloflat">
+                       <apn value="gloflat" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <name>WAP</name>
                                <username>wapemovil</username>
                                <password>wapemovil</password>
                        </apn>
-                       <apn value="web.emovil">
+                       <apn value="web.emovil" type="internet" plan="postpaid">
                                <name>Web</name>
                                <username>webemovil</username>
                                <password>webemovil</password>
                        </apn>
-                       <apn value="internet.ideasalo.ni">
+                       <apn value="internet.ideasalo.ni" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </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="postpaid" />
+                       <apn value="fastinternet" type="internet" 
plan="postpaid" />
+                       <apn value="internet" type="internet" plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid"/>
                </gsm>
        </provider>
        <provider>
                <name>XS4ALL Mobiel Internet</name>
                <gsm>
-                       <apn value="umts.xs4all.nl">
+                       <apn value="umts.xs4all.nl" type="internet" 
plan="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <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="postpaid">
                                <dns>80.232.41.10</dns>
                                <dns>80.232.41.20</dns>
                        </apn>
-- 
1.7.1

_______________________________________________
networkmanager-list mailing list
networkmanager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list

Reply via email to