Modified download class to include downloader