Updated downloader and DB extractor