Adapt for downloader changes