Added downloader and proxy