Downloader and parser improvement