diff --git a/Config/whois.ini b/Config/whois.ini
index 4f12b7c..f948be8 100644
--- a/Config/whois.ini
+++ b/Config/whois.ini
@@ -34,23 +34,20 @@ ac[template] = icb
 ac[format] = 'cgi-bin/whois?query=%domain%'
 ac[adapter] = http
 
-ac.uk[server] = whois.ja.net
-ac.uk[template] = janet
-
 ae[server] = whois.aeda.net.ae
-ae[template] = standard
+ae[template] = ae
 
 aero[server] = whois.aero
-aero[template] = standard
+aero[template] = afilias
 
-af[server] = whois.nic.af
-af[template] = standard
+af[server] = whois.coccaregistry.net
+af[template] = afilias
 
 ag[server] = whois.nic.ag
-ag[template] = standard
+ag[template] = afilias
 
 agency[server] = whois.nic.agency
-agency[template] = standard
+agency[template] = agency
 
 ai[server] = whois.ai
 ai[template] = ai
@@ -86,7 +83,7 @@ bi[server] = whois1.nic.bi
 bi[template] = cocca
 
 biz[server] = whois.biz
-biz[template] = standard
+biz[template] = neustar
 
 bo[server] = whois.nic.bo
 bo[template] = bo
@@ -99,17 +96,12 @@ buzz[server] = whois.nic.buzz
 by[server] = whois.cctld.by
 by[template] = by
 
-; Some sources have the whois server for this as whois.belizenic.bz
-; But this appears to be wrong as it answers incorrectly for domains known to exist
 bz[server] = whois2.afilias-grs.net
 bz[template] = afilias
 
 ca[server] = whois.cira.ca
 ca[template] = ca
 
-capetown[server] = whois.nic.capetown
-capetown[template] = standard
-
 cat[server] = whois.cat
 cat[template] = afilias
 
@@ -123,33 +115,20 @@ cd[template] = cd
 ch[server] = whois.nic.ch
 ch[template] = switchnic
 
-ci[server] = whois.nic.ci
-ci[template] = ci
-
-; FIXME Appears to be invalid - unable to find a current whois server - left in place for now in case issue is temporary
 ck[server] = whois.nic.ck
 ck[template] = ck
 
-cl[server] = whois.nic.cl
-cl[encoding] = iso-8859-1
-cl[template] = cl
-
 club[server] = whois.nic.club
 club[template] = club
 
-cm[server] = whois.netcom.cm
-cm[template] = standard
+cm[server] = netcom.cm
+cm[template] = cocca
 
 cn[server] = whois.cnnic.cn
 cn[template] = afilias
 
 co[server] = whois.nic.co
-co[template] = standard
-
-co.com[server] = whois.nic.co.com
-co.com[template] = standard
-; Additional server used by some co.com domains
-whois.co.com[template] = standard
+co[template] = neustar
 
 co.nl[server] = whois.co.nl
 co.nl[template] = afilias
@@ -172,15 +151,6 @@ com.de[template] = de
 com.ua[server] = whois.ua
 com.ua[template] = comua
 
-co.za[server] = whois.registry.net.za
-co.za[template] = zacr
-
-cu[server] = http://www.nic.cu/
-cu[adapter] = http
-cu[format] = "dom_det.php?domsrch=%domain%"
-cu[template] = cu
-cu[encoding] = iso-8859-1
-
 coop[server] = whois.nic.coop
 coop[template] = coop
 
@@ -201,9 +171,6 @@ dk[format] = '--charset=utf-8 --show-handles %domain%'
 dm[server] = whois.nic.dm
 dm[template] = dm
 
-durban[server] = whois.nic.durban
-durban[template] = standard
-
 dz[server] = whois.nic.dz
 dz[template] = dz
 
@@ -252,9 +219,6 @@ gi[template] = afilias
 gl[server] = whois.nic.gl
 gl[template] = cocca
 
-gov.za[server] = whois.gov.za
-gov.za[template] = govza
-
 gs[server] = whois.coccaregistry.net
 gs[template] = afilias
 
@@ -288,15 +252,14 @@ im[server] = whois.nic.im
 im[template] = im
 
 in[server] = whois.inregistry.net
-in[template] = standard
+in[template] = afilias
 
 info[server] = whois.afilias.net
-info[template] = standard
+info[template] = afilias
 
 int[server] = whois.iana.org
 int[template] = int
 
-; has whois.nic.io, but returns much less info
 io[server] = http://www.nic.io/
 io[template] = io
 io[format] = 'cgi-bin/whois?query=%domain%'
@@ -321,9 +284,6 @@ jobs[server] = jobswhois.verisign-grs.com
 jobs[template] = verisign
 jobs[format] = domain %domain%
 
-joburg[server] = whois.nic.joburg
-joburg[template] = standard
-
 jp[server] = whois.jprs.jp
 jp[template] = jp
 jp[format] = '%domain%/e'
@@ -371,7 +331,7 @@ md[server] = whois.nic.md
 md[template] = md
 
 me[server] = whois.nic.me
-me[template] = standard
+me[template] = afilias
 
 mg[server] = whois.nic.mg
 mg[template] = afilias
@@ -394,9 +354,6 @@ museum[template] = afilias
 mx[server] = whois.mx
 mx[template] = mx
 
-my[server] = whois.mynic.my
-my[template] = my
-
 na[server] = whois.na-nic.com.na
 na[template] = afilias
 
@@ -419,11 +376,8 @@ net[template] = verisign
 net.cc[server] = whois.coccaregistry.net
 net.cc[template] = afilias
 
-net.za[server] = net-whois.registry.net.za
-net.za[template] = standard
-
-nf[server] = whois.nic.nf
-nf[template] = standard
+nf[server] = whois.coccaregistry.net
+nf[template] = afilias
 
 ng[server] = whois.nic.net.ng
 ng[template] = afilias
@@ -432,27 +386,24 @@ nl[server] = whois.domain-registry.nl
 nl[template] = nl
 
 no[server] = whois.norid.no
-no[template] = "no"
+no[template] = no
 no[encoding] = iso-8859-1
 
 nz[server] = whois.srs.net.nz
 nz[template] = nz
 
-nu[server] = whois.nic.nu
+nu[server] = whois.iis.nu
 nu[template] = nu
 
 om[server] = whois.registry.om
 om[template] = om
 
 org[server] = whois.pir.org
-org[template] = standard
+org[template] = afilias
 
 org.cc[server] = whois.coccaregistry.net
 org.cc[template] = afilias
 
-org.za[server] = org-whois.registry.net.za
-org.za[template] = standard
-
 pe[server] = kero.yachay.pe
 pe[template] = cocca
 
@@ -478,7 +429,7 @@ pw[template] = afilias
 qa[server] = whois.registry.qa
 qa[template] = qa
 
-pro[server] = whois.registrypro.pro
+pro[server] = whois.afilias.net
 pro[template] = afilias
 
 re[server] = whois.nic.re
@@ -490,9 +441,6 @@ ro[template] = ro
 rs[server] = whois.rnids.rs
 rs[template] = rs
 
-ru[server] = whois.tcinet.ru
-ru[template] = su
-
 sb[server] = whois.coccaregistry.net
 sb[template] = afilias
 
@@ -510,21 +458,12 @@ sh[template] = icb
 sh[format] = 'cgi-bin/whois?query=%domain%'
 sh[adapter] = http
 
-si[server] = whois.arnes.si
-si[template] = si
-
 sk[server] = whois.sk-nic.sk
 sk[template] = sk
 
-sky[server] = whois.nic.sky
-sky[template] = standard
-
 sm[server] = whois.nic.sm
 sm[template] = sm
 
-sn[server] = whois.nic.sn
-sn[template] = sn
-
 so[server] = whois.nic.so
 so[template] = afilias
 
@@ -569,12 +508,8 @@ tm[adapter] = http
 tn[server] = whois.ati.tn
 tn[template] = tn
 
-to[server] = whois.tonic.to
-to[template] = to
-
 tr[server] = whois.nic.tr
 tr[template] = tr
-tr[encoding] = iso-8859-1
 
 travel[server] = whois.nic.travel
 travel[template] = neustar
@@ -600,7 +535,7 @@ uk[template] = uk
 uk[encoding] = iso-8859-1
 
 us[server] = whois.nic.us
-us[template] = standard
+us[template] = neustar
 
 uy[server] = whois.nic.org.uy
 uy[template] = uy
@@ -617,9 +552,6 @@ ve[template] = ve
 vu[server] = vunic.vu
 vu[template] = vu
 
-web.za[server] = web-whois.registry.net.za
-web.za[template] = standard
-
 wf[server] = whois.nic.wf
 wf[template] = afnic
 
@@ -704,25 +636,12 @@ yt[template] = afnic
 ; Whois server for private domain names
 ;----------------------------------------------------------------
 centralnic[server] = whois.centralnic.com
-centralnic[template] = standard
+centralnic[template] = afilias
 
 venez[server] = http://whois.venez.fr/
 venez[format] = 'whois.fr.html?name=%subdomain%&domain=%tld%'
 venez[adapter] = http
 venez[template] = venez
-venez[encoding] = iso-8859-1
-
-
-domain-registry-whois.l.google.com[template] = standard
-whois.afilias.net[template] = standard
-whois.afilias-srs.net[template] = standard
-whois.centralnic.com[template] = standard
-whois.donuts.co[template] = standard
-whois-dub.mm-registry.com[template] = standard
-whois.ksregistry.net[template] = standard
-whois.rightside.co[template] = standard
-whois.uniregistry.net[template] = standard
-whois.unitedtld.com[template] = standard
 
 ;----------------------------------------------------------------
 ; Whois server for IP addresses mapping to Templates
@@ -737,235 +656,107 @@ whois.ripe.net[template] = ripe
 ; Whois server for domain names mapping to Templates
 ; IANA ID as remark (http://www.iana.org/assignments/registrar-ids/registrar-ids.xml)
 ;----------------------------------------------------------------
-grs-whois.hichina.com[template] = standard ; #420
-nswhois.domainregistry.com[template] = domainregistry ; #128
+grs-whois.hichina.com[template] = standard
 whois.007names.com[template] = gtld_networksolutions ; #91
-whois.101domain.com[template] = standard ; #1011
-whois.1api.net[template] = standardliar ; #1387
+whois.1api.net[template] = gtld_rrpproxy ; #1387
 whois.123-reg.co.uk[template] = standard
-whois.1und1.info[template] = standard
-whois.22.cn[template] = twentytwocn ; #1555
-whois.35.com[template] = standard ; #1316
-whois.above.com[template] = standard ; #940
-whois.acquirednames.com[template] = standard ; #1677
-whois.activeregistrar.com[template] = standard ; #1090
-whois.advancedregistrar.com[template] = standard ; #1005
+whois.above.com[template] = standard
 whois.afternic.com[template] = gtld_networksolutions ; #996
-whois.allearthdomains.com[template] = standard ; #1159
-whois.anchovy.com[template] = standard ; #1562
-whois.annulet.com[template] = standard ; #607
+whois.allearthdomains.com[template] = standard
 whois.antagus.de[template] = gtld_vautron ; #1443
 whois.apisrs.com[template] = afilias ; #380
-whois.ascio.com[template] = standardliar ; #106
-whois.astutium-grs.com[template] = standard ; #1471
-whois.astutium.com[template] = standard ; #1471
-whois.belmontdomains.com[template] = standard ; #1163
+whois.ascio.com[template] = gtld_networksolutions ; #106
 whois.biglizarddomains.com[template] = standard
-whois.bigrock.com[template] = standard
-whois.binero.se[template] = binero ; #1581
-whois.bizcn.com[template] = standard ; #471
+whois.bizcn.com[template] = gtld_xinnet ; #471
 whois.blacknight.com[template] = gtld_rrpproxy ; #1448
-whois.bluehost.com[template] = standard ; #1154
-whois.bluerazor.com[template] = standard ; #612
-whois.bookmyname.com[template] = standard ; #74
-whois.bookmyname.com[encoding] = iso-8859-1
-whois.boterosolutions.net[template] = botero ; #1536
-whois.chinanet.cc[template] = chinanet ; #1590
-whois.columbianames.com[template] = standard ; #1169
-whois.comlaude.com[template] = standard ; #470
-whois.communigal.net[template] = standard ; #418
+whois.columbianames.com[template] = standard
+whois.communigal.net[template] = standard
 whois.corehub.net[template] = standard
 whois.corenic.net[template] = afilias ; #15
-whois.corporatedomains.com[template] = standard ; #430
+whois.corporatedomains.com[template] = gtld_networksolutions ; #430
 whois.cps-datensysteme.de[template] = gtld_cpsdatensysteme ; #1239
-whois.crazydomains.com[template] = standard ; #1291
 whois.cronon.net[template] = standard ; #141
 whois.cronon.net[encoding] = iso-8859-1
-whois.demys.com[template] = standard ; #1488
-whois.dharanadomains.com[template] = standard ; #1544
-whois.directnic.com[template] = standard ; #291
+whois.directnic.com[template] = gtld_networksolutions ; #291
 whois.discount-domain.com[template] = afilias ; #49
-whois.discountdomainsuk.com[template] = standard ; #1369
-whois.distributeit.com.au[template] = standard ; #900
-whois.domainarmada.com[template] = standard ; #1173
-whois.domainclip.com[template] = standard ; #889
-whois.domaincomesaround.com[template] = standardliar ; #1176
-whois.domaindiscover.com[template] = standard ; #86
-whois.domainpeople.com[template] = standard ; #65
-whois.domainwards.com[template] = standard ; #1540
-whois.domrobot.com[template] = standard ; #1420
+whois.domainarmada.com[template] = standard
+whois.domaincomesaround.com[template] = standardliar
+whois.domrobot.com[template] = gtld_domrobot ; #1420
 whois2.domain.com[template] = gtld_networksolutions ; #66
-whois.domain.com[template] = standard ; #886
-whois.domainca.com[template] = domainca ; #449
-whois.domaincontext.com[template] = standard ; #1111
-whois.domainguardians.com[template] = zerosys ; #1076
-whois.domaininfo.com[template] = standard ; #73
-whois.domaininthehole.com[template] = standard ; #1181
-whois.domainit.com[template] = standard ; #412
-whois.domainname.com[template] = standard ; #450
-whois.domainnameshop.com[template] = standard ; #1001
-whois.domainnameshop.com[encoding] = iso-8859-1
+whois.domain.com[template] = gtld_networksolutions ; #886
 whois.domainprocessor.com[template] = gtld_networksolutions ; #363
-whois.domainsite.com[template] = standard ; #104
-whois.domainsoftheworld.net[template] = standard ; #1192
-whois.domaintimemachine.com[template] = standard ; #1200
-whois.domainyeti.com[template] = standard ; #1201
-whois.doregi.com[template] = standard ; #87
-whois.dreamhost.com[template] = standard ; #431
-whois.dynadot.com[template] = standard ; #472
-whois.dynadot9.com[template] = standard ; #1864
-whois.dyndns.com[template] = dyndns ; #1040
-whois.easydns.com[template] = standard ; #469
-whois.easyspace.com[template] = standard ; #79
-whois.echodomain.com[template] = standard ; #1685
-whois.ekados.com[template] = standard ; #1003
-whois.ename.com[template] = standard ; #1331
+whois.domainsite.com[template] = standard
+whois.domainsoftheworld.net[template] = standard
+whois.domainyeti.com[template] = standard
+whois.dreamhost.com[template] = standard
+whois.dynadot.com[template] = standard
+whois.dyndns.com[template] = gtld_networksolutions ; #1040
+whois.easyspace.com[template] = gtld_networksolutions ; #79
 whois.encirca.com[template] = afilias ; #455
-whois.enetica.com.au[template] = enetica ; #618
-whois.enom.com[template] = standard ; #48
+whois.enom.com[template] = gtld_enom ; #48
 whois.enterprice.net[template] = afilias ; #85
-whois.entorno.com[template] = standard ; #696
-whois.epik.com[template] = standard ; #687
-whois.eunamesoregon.com[template] = standard ; #1204
-whois.eurodns.com[template] = standardliar ; #1052
-whois.euturbo.com[template] = standard ; #1207
-whois.fabulous.com[template] = standard ; #411
-whois.fastdomain.com[template] = standard ; #1154
-whois.findyouadomain.com[template] = standard ; #946
-whois.findyouaname.com[template] = standard ; #947
-whois.flancrestdomains.com[template] = standard ; #1208
-whois.freeparking.co.uk[template] = standardliar ; #837
-whois.freshbreweddomains.com[template] = standard ; #1209
-whois.gabia.com[template] = standard ; #244
-whois.gandi.net[template] = gandi ; #81
-whois.gkg.net[template] = standard ; #93
-whois.glamdomains.com[template] = standard ; #1572
-whois.goaustraliadomains.com[template] = standard ; #1151
-whois.gocanadadomains.com[template] = standard ; #1150
-whois.gochinadomains.com[template] = standard ; #1149
-whois.godaddy.com[template] = standard ; #146
-whois.godomaingo.com[template] = standard ; #1211
-whois.gofrancedomains.com[template] = standard ; #1153
-whois.hawthornedomains.com[template] = standard ; #1341
-whois.hebeidomains.com[template] = standard ; #1429
-whois.hosting.kr[template] = standard ; #1489
-whois.hostingservicesinc.net[template] = standard
-whois.hostmonster.com[template] = standard ; #1154
-whois.iaregistry.com[template] = standard ; #123
-whois.ibi.net[template] = netpia ; #130
-whois.imminentdomains.net[template] = standard ; #1215
-whois.in2net.com[template] = standard ; #604
-whois.inames.co.kr[template] = standard ; #444
+whois.eunamesoregon.com[template] = standard
+whois.eurodns.com[template] = standardliar
+whois.euturbo.com[template] = standard
+whois.fabulous.com[template] = standard
+whois.fastdomain.com[template] = standard
+whois.findyouadomain.com[template] = standard
+whois.gandi.net[template] = gtld_gandi ; #81
+whois.gochinadomains.com[template] = standard
+whois.godaddy.com[template] = standard
+whois.godomaingo.com[template] = standard
+whois.hostingservicesinc.net = standard
 whois.inname.net[template] = gtld_rrpproxy ; #648
-whois.instantnames.com[template] = standard ; #1256
 whois.instra.net[template] = gtld_rrpproxy ; #1376
 whois.interdomain.net[template] = gtld_melbourneit ; #140
-whois.internet.bs[template] = standard ; #814
-whois.internetters.co.uk[template] = standard ; #424
-whois.ireg.net[template] = standard ; #987
-whois.iserveyourdomain.com[template] = standard ; #944
-whois.joker.com[template] = standard ; #113
-whois.jprs.jp[template] = standard ; #1485
-whois.ladasdomains.com[template] = standard ; #642
-whois.launchpad.com[template] = standard ; #955
-whois.lcn.com[template] = standard ; #602
-whois.lexsynergy.com[template] = standard ; #1466
-whois.libris.com[template] = standard ; #381
-whois.liquidnetlimited.com[template] = standard ; #1472
-whois.mailclub.net[template] = standard ; #1290
-whois.maprilis.com.vn[template] = aprilsea ; #1475
-whois.markmonitor.com[template] = standard ; #292
+whois.internet.bs[template] = standard
+whois.joker.com[template] = gtld_joker ; #113
+whois.markmonitor.com[template] = gtld_markmonitor ; #292
 whois.melbourneit.com[template] = gtld_melbourneit ; #13
-whois.meshdigital.com[template] = standard ; #1390
-whois.mijninternetoplossing.nl[template] = standard ; #1587
 whois.misk.com[template] = gtld_networksolutions ; #401
-whois.moniker.com[template] = standard ; #228
+whois.moniker.com[template] = gtld_networksolutions ; #228
 whois.name.com[template] = gtld_name ; #625
 whois.namebay.com[template] = afilias ; #88
-whois.namebright.com[template] = standard ; #1441
-whois.namecheap.com[template] = standard ; #1068
-whois.nameemperor.com[template] = standard ; #1220
-whois.nameisp.com[template] = standard ; #1371
-whois.namejuice.com[template] = standard ; #636
-whois.nameking.com[template] = standard ; #609
-whois.namepal.com[template] = standard ; #771
-whois.namepanther.com[template] = standard ; #1344
+whois.nameemperor.com[template] = standard;
 whois.names4ever.com[template] = gtld_networksolutions ; #52
 whois.namesbeyond.com[template] = gtld_networksolutions ; #378
 whois.namesecure.com[template] = gtld_networksolutions ; #30
-whois.namesilo.com[template] = standard ; #1479
-whois.nameturn.com[template] = standard ; #1616
-whois.net-chinese.com.tw[template] = standard ; #1336
-whois.net4domains.com[template] = standard ; #1007
-whois.netearthone.com[template] = standard ; #1005
-whois.netregistry.net[template] = standard ; #677
-whois.networksolutions.com[template] = standard ; #2
-whois.nic.ru[template] = standard ; #463
-whois.nicline.com[template] = standard ; #379
+whois.namesilo.com[template] = standard
+whois.net-chinese.com.tw[template] = standard
+whois.networksolutions.com[template] = gtld_networksolutions ; #2
 whois.nicproxy.com[template] = gtld_rrpproxy ; #1454
-whois.no-ip.com[template] = standard ; #1327
-whois.nominalia.com[template] = standard ; #76
-whois.nominate.net[template] = standard ; #134
 whois.novutec.com[template] = gtld_rrpproxy ; no IANA ID
-whois.oleane.net[template] = ck ; #14
-whois.onlinenic.com[template] = standard ; #82
-whois.ovh.com[template] = standard ; #433
-whois.ownregistrar.com[template] = ownregistrar ; #1250
-whois.pairnic.com[template] = standard ; #99
-whois.pananames.com[template] = standard ; #1449
-whois.paragonnames.net[template] = standard ; #1860
+whois.ovh.com[template] = standard
 whois.paycenter.com.cn[template] = gtld_xinnet ; #120
-whois.pheenix.com[template] = standard ; #888
+whois.pheenix.com[template] = standard
 whois.planetdomain.com[template] = afilias ; #240
 whois.plisk.com[template] = gtld_networksolutions ; #670
 whois.pocketdomain.com[template] = afilias ; #913
-whois.presidentialdomains.com[template] = standard ; #1617
-whois.pronamed.com[template] = standard ; #1579
-whois.protondomains.com[template] = standard ; #1231
-whois.psi-usa.info[template] = standard ; #151
-whois.publicdomainregistry.com[template] = standard ; #303
+whois.protondomains.com[template] = standard
+whois.psi-usa.info[template] = gtld_psiusa ; #151
+whois.publicdomainregistry.com[template] = standard
 whois.puredomain.com[template] = gtld_variomedia ; #1257
-whois.rebel.com[template] = standard ; #600
-whois.reg.ru[template] = standard ; #1606
-whois.register.eu[template] = standard ; #1467
-whois.register.it[template] = standard ; #168
-whois.register.com[template] = standard ; #9
-whois.registermatrix.com[template] = standard ; #1114
+whois.register.com[template] = gtld_networksolutions ; #9
 whois.registrar.telekom.de[template] = gtld_deutschetelekom ; #226
 whois.registrar.telekom.de[format] = full %domain% ; #226
 whois.registrygate.com[template] = gtld_rrpproxy ; #1328
+whois.regtime.net[template] = standard
 whois.regtons.com[template] = standard
-whois.rrpproxy.net[template] = standard ; #269
-whois.safenames.net[template] = standard ; #447
-whois.schlund.info[template] = standard ; #83
-whois.scip.es[template] = standard ; #1383
-whois.signdomains.com[template] = standard ; #249
-whois.skykomishdomains.com[template] = standard ; #1232
-whois.snappyregistrar.com[template] = standard ; #1355
-whois.softlayer.com[template] = standard ; #925
-whois.srsplus.com[template] = standard ; #320
+whois.rrpproxy.net[template] = gtld_rrpproxy ; #269
+whois.schlund.info[template] = gtld_schlund ; #83
+whois.skykomishdomains.com[template] = standard
+whois.srsplus.com[template] = gtld_networksolutions ; #320
 whois.subreg.cz[template] = afilias ; #1505
-whois.syrahost.com[template] = standard ; #1291
-whois.threadagent.com[template] = standardliar ; #1019
-whois.tigertech.net[template] = standard ; #841
 whois.tirupatidomains.in[template] = standard
-whois.tldregistrarsolutions.com[template] = standard ; #1564
 whois.totalregistrations.com[template] = gtld_networksolutions ; #131
-whois.tppwholesale.com.au[template] = standard ; #900
-whois.tucows.com[template] = standard ; #69
-whois.udag.net[template] = standard ; #1408
+whois.tucows.com[template] = gtld_networksolutions ; #69
+whois.udag.net[template] = gtld_rrpproxy ; #1408
 whois.udomainname.com[template] = gtld_networksolutions ; #931
-whois.uniregistrar.com[template] = standard ; #1659
-whois.uniregistrar.net[template] = standard ; #1659
+whois.uniregistrar.com[template] = standard
+whois.uniregistrar.net[template] = standard
 whois.webmasters.com[template] = gtld_networksolutions ; #634
-whois.webnic.cc[template] = standard ; #460
-whois.website.ws[template] = standard ; #1463
-whois.websitesource.com[template] = standard ; #1404
-whois.west263.com[template] = chengdu ; #1556
+whois.webnames.ru[template] = standard
 whois.wildwestdomains.com[template] = gtld_godaddy ; #440
 whois.yesnic.com[template] = standard
 whois.your-server.de[template] = gtld_hetzner ; #828
 whois.yourjungle.com[template] = standard
-whois.yoursrs.com[template] = standard ; #839
-whois.zoomregistrar.com[template] = standard ; #1575
-whois2013.jprs.jp[template] = standard ; #1485
diff --git a/Templates/Gtld_domrobot.php b/Templates/Gtld_domrobot.php
new file mode 100644
index 0000000..0a51be6
--- /dev/null
+++ b/Templates/Gtld_domrobot.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Novutec Domain Tools
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @category   Novutec
+ * @package    DomainParser
+ * @copyright  Copyright (c) 2007 - 2013 Novutec Inc. (http://www.novutec.com)
+ * @license    http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/**
+ * @namespace Novutec\WhoisParser\Templates
+ */
+namespace Novutec\WhoisParser\Templates;
+
+use Novutec\WhoisParser\Templates\Type\Regex;
+
+/**
+ * Template for whois.domrobot.com
+ *
+ * @category   Novutec
+ * @package    WhoisParser
+ * @copyright  Copyright (c) 2007 - 2013 Novutec Inc. (http://www.novutec.com)
+ * @license    http://www.apache.org/licenses/LICENSE-2.0
+ */
+class Gtld_domrobot extends Regex
+{
+
+    /**
+     * Blocks within the raw output of the whois
+     * 
+     * @var array
+     * @access protected
+     */
+    protected $blocks;
+
+
+    /**
+     * Items for each block
+     * 
+     * @var array
+     * @access protected
+     */
+    protected $blockItems;
+
+
+    /**
+     * Contact types with the same structure 
+     * 
+     * @var array
+     * @access protected
+     */
+    const CONTACTS = [
+        'admin' => 'admin',
+        'tech' => 'tech',
+        'billing' => 'billing',
+        'registrant' => 'registrant',
+    ];
+
+
+
+    public function __construct() {
+        $this->blocks = [
+            1 => '/^[\s\n\r]*[^:]*:[\s\n\r]*(.*)$/im',
+            2 => '/\s*name\s*server\s*:(?>[\x20\t]*)(.*?)(?=dnssec)|$/is'
+        ];
+
+        $items = [];
+        /**
+         * Create contact specific regexps from base template
+         */
+        foreach(self::CONTACTS as $regexp => $property) {
+            $items['/^\s*' . $regexp . '\s*name\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':name';
+            $items['/^\s*' . $regexp . '\s*organization\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':organization';
+            $items['/^\s*' . $regexp . '\s*street\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':street';
+            $items['/^\s*' . $regexp . '\s*city\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':city';
+            $items['/^\s*' . $regexp . '\s*state\/province\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':state';
+            $items['/^\s*' . $regexp . '\s*postal\s*code\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':zipcode';
+            $items['/^\s*' . $regexp . '\s*country\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':country';
+            $items['/^\s*' . $regexp . '\s*phone\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':phone';
+            $items['/^\s*' . $regexp . '\s*phone\s*ext\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':phone_ext';
+            $items['/^\s*' . $regexp . '\s*fax\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':fax';
+            $items['/^\s*' . $regexp . '\s*fax\s*ext\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':fax_ext';
+            $items['/^\s*' . $regexp . '\s*email\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':email';
+            $items['/^\s*registry\s*' . $regexp . '\s*id\s*:(?>[\x20\t]*)(.*?)$/im'] = 'contacts:' . $property . ':id';
+        }
+
+        /**
+         * Domain data
+         */
+        $items['/^\s*dnssec\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:dnssec';
+        $items['/^\s*updated\s*date\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:updated_date';
+        $items['/^\s*creation\s*date\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:creation_date';
+        $items['/^\s*domain\s*name\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:name';
+        $items['/^\s*domain\s*status\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:status';
+        $items['/^\s*registry\s*domain\s*id\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:id';
+        $items['/^\s*internationalized\s*domain\s*name\s*:(?>[\x20\t]*)(.*?)$/im'] = 'domain:idna';
+
+        /**
+         * Server data
+         */
+        $items['/^\s*>>>\s*last\s*update\s*of\s*whois\s*database\s*:(?>[\x20\t]*)(.*?)\s*<<<\s*$/im'] = 'server:last_update';
+
+        /**
+         * Registrar data
+         */ 
+        $items['/^\s*registrar\s*:(?>[\x20\t]*)(.*?)$/im'] = 'registrar:name';
+        $items['/^\s*registrar\s*iana\s*id\s*:(?>[\x20\t]*)(.*?)$/im'] = 'registrar:iana_id';
+        $items['/^\s*registrar\s*abuse\s*contact\s*email\s*:(?>[\x20\t]*)(.*?)$/im'] = 'registrar:abuse_email';
+        $items['/^\s*registrar\s*abuse\s*contact\s*phone\s*:(?>[\x20\t]*)(.*?)$/im'] = 'registrar:abuse_phone';
+        
+        $this->blockItems = [
+            1 => $items,
+            2 => [
+                '/^\s*name\s*server\s*:(?>[\x20\t]*)(.*?)$/im' => 'domain:nameservers:nameserver'
+           ]
+        ];
+        
+    }
+
+ 
+}
+