diff --git a/tools/archives/pyvo_integration/astronomical_archives.xml b/tools/archives/pyvo_integration/astronomical_archives.xml
index 9be9b468..97af9423 100644
--- a/tools/archives/pyvo_integration/astronomical_archives.xml
+++ b/tools/archives/pyvo_integration/astronomical_archives.xml
@@ -9,13 +9,11 @@
diff --git a/tools/archives/pyvo_integration/tool-data/astronomical_archives_gen.loc.sample b/tools/archives/pyvo_integration/tool-data/astronomical_archives_gen.loc.sample
new file mode 100644
index 00000000..11c4bc6a
--- /dev/null
+++ b/tools/archives/pyvo_integration/tool-data/astronomical_archives_gen.loc.sample
@@ -0,0 +1,140 @@
+# Table used for listing astronomical archives TAP service urls
+#
+0 AIP DaCHS TAP service http://gavo.aip.de/tap
+1 MAST STScI CAOM and ObsCore TAP service https://vao.stsci.edu/CAOMTAP/TapService.aspx
+2 MAST STScI Hubble Source Catalog Version 3 (HSCv3) TAP service https://vao.stsci.edu/hsctap/TapService.aspx
+3 MAST STScI Hubble Source Catalog Version 2 (HSCv2) TAP service http://vao.stsci.edu/hscv2tap/TapService.aspx
+4 MAST STScI Hubble Source Catalog Version 3 (HSCv3) TAP service http://vao.stsci.edu/hsctap/TapService.aspx
+5 MAST STScI MissionMAST TAP service for HST Science Data https://vao.stsci.edu/MissionMAST/TapService.aspx
+6 MAST STScI PanSTARRS 1 DR2 TAP service https://vao.stsci.edu/PS1DR2/TapService.aspx
+7 MAST STScI Registry TAP service https://vao.stsci.edu/RegTAP/TapService.aspx
+8 MAST STScI CLASSY HLSP TAP service https://vao.stsci.edu/HLSP_CLASSY/TapService.aspx
+9 MAST STScI ULLYSES HLSP TAP service https://vao.stsci.edu/HLSP_ULLYSES/TapService.aspx
+10 UCL DaCHS server TAP service http://astroweb.projects.phys.ucl.ac.uk:8000/tap
+11 The VO @ ASTRON TAP service https://vo.astron.nl/tap
+12 AIASCR VO Services TAP service http://vos2.asu.cas.cz/tap
+13 CSIRO Australia Telescope Online Archive TAP Service https://atoavo.atnf.csiro.au/tap
+14 CSIRO ASKAP Science Data Archive TAP Service https://casda.csiro.au/casda_vo_tools/tap
+15 CSIRO Parkes Pulsar Data Archive https://data.csiro.au/psrdavo/tap
+16 VESPA PA team server TAP service http://vespa-ae.oma.be/tap
+17 ArVO Byurakan TAP service http://arvo-registry.sci.am/tap
+18 CADC Archive Query Service https://ws.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/argus
+19 CANFAR User Catalogue Query Service https://ws-cadc.canfar.net/youcat
+20 Planetary and heliophysics plasma data at CDPP/AMDA http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap
+21 Illumination maps of 67P http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap
+22 Magnetosphere Ionosphere coupling simulation runs http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap
+23 SIMBAD TAP query engine http://simbad.cds.unistra.fr/simbad/sim-tap
+24 TAP VizieR query engine http://cdsarc.cds.unistra.fr/saadavizier.tap/tap
+25 TAP VizieR query engine http://tapvizier.cds.unistra.fr/TAPVizieR/tap
+26 J-PLUS DR1 Catalogue (July, 2018) https://archive.cefca.es/catalogues/jplus-dr1/tap_async.html
+27 J-PLUS DR2 Catalogue (July, 2020) https://archive.cefca.es/catalogues/jplus-dr2/tap_async.html
+28 J-PLUS DR3 Catalogue (July, 2022) https://archive.cefca.es/catalogues/jplus-dr3/tap_async.html
+29 MINIJ-PAS PDR201912 Catalogue (December, 2019) https://archive.cefca.es/catalogues/minijpas-pdr201912/tap_async.html
+30 ChiVO TAP service https://vo.chivo.cl/tap
+31 Chandra X-ray Observatory Data Archive https://cda.harvard.edu/cxctap
+32 Chandra Source Catalog http://cda.cfa.harvard.edu/csctap
+33 Chandra Source Catalog Release 1 http://cda.cfa.harvard.edu/csc1tap
+34 Chandra Source Catalog Release 2 http://cda.cfa.harvard.edu/csc2tap
+35 European HST Archive TAP https://hst.esac.esa.int/tap-server/tap
+36 ESASky TAP https://sky.esa.int/esasky-tap/tap
+37 ESASky Legacy TAP https://esaskylegacy.esac.esa.int/esasky-legacy-sl-tap/tap
+38 Gaia TAP https://gea.esac.esa.int/tap-server/tap
+39 HREDA TAP https://hreda.esac.esa.int/hreda-sl-tap/tap
+40 Herschel TAP http://archives.esac.esa.int/hsa/whsa-tap-server/tap
+41 Integral Science Archive TAP https://isla.esac.esa.int/tap/tap
+42 Infrared Space Observatory (ISO) TAP http://nida.esac.esa.int/nida-sl-tap/tap
+43 European JWST Archive TAP https://jwst.esac.esa.int/server/tap
+44 ESA PSA EPNTAP https://archives.esac.esa.int/psa-tap/tap
+45 EURO-VO Registry TAP https://registry.euro-vo.org/regtap/tap
+46 XMM-Newton data and catalogues http://nxsa.esac.esa.int/tap-server/tap
+47 ESO TAP_CAT: a TAP service to query the astronomical catalogs generated by ESO observers, including the catalogs of the ESO Public Surveys. http://archive.eso.org/tap_cat
+48 ESO TAP_OBS: a TAP service to browse and access raw and reduced data, and to query the ambient measurements, of the La Silla Paranal Observatory. http://archive.eso.org/tap_obs
+49 FAI archives TAP service http://vo.fai.kz/tap
+50 Planetary web services @ FUB TAP service http://dachs.planet.fu-berlin.de/tap
+51 Gaia@AIP TAP Service https://gaia.aip.de/tap
+52 GEOPS/IPSL DaCHS Server TAP service https://dachs-vo.ipsl.fr/tap
+53 Laurino et al 2011 Catalog of WGE photometric redshifts for SDSS candidate qsos and galaxies http://ia2-tap.oats.inaf.it:8080/wgetap
+54 IAPS TAP SERVICE http://vo-node1.iaps.inaf.it/tap
+55 IAPS TAP SERVICES TAP service http://vo-node1.iaps.inaf.it/tap
+56 INAF IA2 Project Resources TAP Service http://archives.ia2.inaf.it/vo/tap/projects
+57 IAP - DaCHS Services TAP service http://dorotka.ufa.cas.cz/tap
+58 IDOC: Integrated Data and Operating Center TAP service http://idoc-dachs.ias.u-psud.fr/tap
+59 IRSA Table Access Protocol (TAP) Service https://irsa.ipac.caltech.edu/TAP
+60 JacobsUni EPN TAP service https://epn1.epn-vespa.jacobs-university.de/tap
+61 Official ALMA Table Access (EA server at NAOJ) https://almascience.nao.ac.jp/tap
+62 Official ALMA Table Access (EU server at ESO) https://almascience.eso.org/tap
+63 Official ALMA Table Access (NA server at NRAO) https://almascience.nrao.edu/tap
+64 EVN Data Archive TAP service http://evn-vo.jive.eu/tap
+65 Catalog Quasars and Active Galactic Nuclei http://jvo.nao.ac.jp/skynode/do/tap/agn
+66 JVO ALMA VO Service http://jvo.nao.ac.jp/skynode/do/tap/alma
+67 AKARI Far-infrared All-Sky Survey Maps http://jvo.nao.ac.jp/skynode/do/tap/akari
+68 AKARI Asteroid Flux Catalogue Version 1 http://jvo.nao.ac.jp/skynode/do/tap/akari/catalog/asteroid_flux
+69 AKARI/IRC NIR Low-resolution Spectral Catalogue of Diffuse Sky Patches http://jvo.nao.ac.jp/skynode/do/tap/akari/ivoa/obscore
+70 AKARI/IRC NIR Spectral Atlas of Galactic Planetary Nebulae http://jvo.nao.ac.jp/skynode/do/tap/akari/ivoa/obscore
+71 AKARI/IRC MIR-S slit-less 9um point source catalogue http://jvo.nao.ac.jp/skynode/do/tap/akari/catalog/slitless_mir_psc
+72 AKARI/IRC MIR-S slit-less spectroscopic catalogue http://jvo.nao.ac.jp/skynode/do/tap/akari/ivoa/obscore
+73 HALCA VSOP (the VLBI Space Observatory Programme) Correlated Data http://jvo.nao.ac.jp/skynode/do/tap/halca
+74 The VSOP (the VLBI Space Observatory Programme) 5 GHz AGN (Active Galactic Nuclei) Survey Program Analysis Data http://jvo.nao.ac.jp/skynode/do/tap/halca_agn
+75 Hitomi Master Catalog http://jvo.nao.ac.jp/skynode/do/tap/hitomi
+76 Comprehensive Catalogue of Kiso UV-X Galaxies (KUG2000) (Nakajima+ 2010) http://jvo.nao.ac.jp/skynode/do/tap/kug2000
+77 Nobeyama Radio Telescope FITS Archive http://jvo.nao.ac.jp/skynode/do/tap/nobeyama/
+78 SAGA -Stellar Abundances for Galactic Archeology Database- http://jvo.nao.ac.jp/skynode/do/tap/saga
+79 Subaru HDS Spectrum data service http://jvo.nao.ac.jp/skynode/do/tap/hds
+80 Subaru MOIRCS data service http://jvo.nao.ac.jp/skynode/do/tap/moircs
+81 Subaru Suprime-Cam data service http://jvo.nao.ac.jp/skynode/do/tap/spcam
+82 Subaru/XMM-Newton Deep Survey v1.0 http://jvo.nao.ac.jp/skynode/do/tap/sxds_v1
+83 KM3NeT Open Data TAP service http://vo.km3net.de/tap
+84 KOA Table Access Protocol (TAP) Service https://koa.ipac.caltech.edu/TAP
+85 TAP server for Konkoly TAP service http://nadir.konkoly.hu:80/tap
+86 KSB-ROB TAP service http://vo-tap.oma.be/tap
+87 CeSAM Virtual Observatory Server TAP service https://vo.lam.fr/tap
+88 LATMOS DaCHS server TAP service http://vo.projet.latmos.ipsl.fr/tap
+89 KIS Science Data Centre TAP service http://dachs.sdc.leibniz-kis.de/tap
+90 DaCHS Server for LMD TAP service http://vo.lmd.jussieu.fr/tap
+91 MUSE-Wide survey TAP Service https://musewide.aip.de/tap
+92 HEASARC Xamin Catalog Interface https://heasarc.gsfc.nasa.gov/xamin/vo/tap
+93 MACHO TAP https://machotap.asvo.nci.org.au/ncitap/tap
+94 SkyMapper TAP https://api.skymapper.nci.org.au/public/tap
+95 WiggleZ Final Data Release TAP https://wiggleztap.asvo.nci.org.au/ncitap/tap
+96 NED TAP VO Service https://ned.ipac.caltech.edu/tap/
+97 OCA Data Center TAP service https://dachs.oca.eu/tap
+98 GAVO Data Center TAP service http://dc.zah.uni-heidelberg.de/tap
+99 OSUG Virtual Observatory TAP service http://osug-vo.osug.fr:8080/tap
+100 CLIMSO coronagraphs at pic du midi de Bigorre http://climso.irap.omp.eu/__system__/tap/run/tap
+101 Synthetic Spectra Convolution Service https://pollux.oreme.org/vo/datalink/speconvol
+102 PADC TAP Server on voparis-tap-astro.obspm.fr TAP service http://voparis-tap-astro.obspm.fr/tap
+103 PADC TAP Server on voparis-tap-he.obspm.fr TAP service http://voparis-tap-he.obspm.fr/tap
+104 PADC TAP Server on voparis-tap-helio.obspm.fr TAP service http://voparis-tap-helio.obspm.fr/tap
+105 PADC TAP Server on voparis-tap-maser.obspm.fr TAP service http://voparis-tap-maser.obspm.fr/tap
+106 PADC TAP Server on voparis-tap-planeto.obspm.fr TAP service http://voparis-tap-planeto.obspm.fr/tap
+107 PDS-PPI VO server TAP service https://vo-pds-ppi.igpp.ucla.edu/tap
+108 Southern Photometric Local Universe Survey https://splus.cloud/public-TAP/tap
+109 OCA Data Center TAP service https://dachs.oca.eu/tap
+110 PADC TAP Server on voparis-rr.obspm.fr TAP service http://voparis-rr.obspm.fr:80/tap
+111 PVOL EPN-TAP TAP service http://pvol2.ehu.eus:8083/tap
+112 Cross section values TAP service http://spectrum.iaa.es/tap
+113 VO HPSL datacenter TAP service http://vespa.cbk.waw.pl/tap
+114 SSDC TAP Service https://tools.ssdc.asi.it/TAPSSDC-1.1
+115 ARI's Gaia TAP Service https://gaia.ari.uni-heidelberg.de/tap
+116 Gaia catalog release 2 https://gaia.obspm.fr/tap-server/tap
+117 H.E.S.S. DL3 public test data release 1 http://voparis-tap-astro.obspm.fr/__system__/tap/run/tap
+118 Nancay Decameter Array observation database http://vogate.obs-nancay.fr/__system__/tap/run/tap
+119 VOXastro Data Center TAP service http://rcsed-vo.sai.msu.ru/tap
+120 6dF Galaxy Survey Data Release 2 http://wfaudata.roe.ac.uk/6df-dsa/TAP
+121 6dF Galaxy Survey Data Release 3 http://wfaudata.roe.ac.uk/6dfdr3-dsa/TAP
+122 ATLAS DR1 - VST ATLAS Survey http://wfaudata.roe.ac.uk/atlasDR1-dsa/TAP
+123 GALEX Release 6 http://wfaudata.roe.ac.uk/galexgr6-dsa/TAP
+124 OSA VST ATLAS Survey http://tap.roe.ac.uk/osa
+125 Personal SuperCOSMOS Science Archive (SSA) http://wfaudata.roe.ac.uk/pssa-dsa/TAP
+126 SuperCOSMOS Science Archive (SSA) http://wfaudata.roe.ac.uk/ssa-dsa/TAP
+127 SuperCOSMOS Science Archive (SSA) http://tap.roe.ac.uk/ssa
+128 2MASS Photometric Redshift catalogue (2MPZ) http://wfaudata.roe.ac.uk/twompz-dsa/TAP
+129 UHS DR2 - UKIRT Hemisphere Survey Data Release 2 http://wfaudata.roe.ac.uk/uhsDR2/TAP
+130 VHS DR4 - VISTA Hemisphere Survey Data Release 4 http://wfaudata.roe.ac.uk/vhsDR4-dsa/TAP
+131 VSA - VISTA Science Archive http://tap.roe.ac.uk/vsa
+132 WSA - WFCAM Science Archive http://tap.roe.ac.uk/wsa
+133 XMM-Newton Serendipitous Source Catalogue (2XMM) http://wfaudata.roe.ac.uk/xmm-dsa/TAP
+134 APPLAUSE - Archives of Photographic PLates for Astronomical USE TAP Service https://www.plate-archive.org/tap
+135 TAP interface of the 3XMM-DR5 XMM-Newton Catalogue http://xcatdb.unistra.fr/3xmmdr5/tap
+136 TAP interface of the 3XMM-dr7 XMM-Newton Catalogue http://xcatdb.unistra.fr/3xmmdr7/tap
+137 TAP interface of the 4XMM dr13 XMM-Newton Catalogue https://xcatdb.unistra.fr/xtapdb