Moved DownloadHandler definition a bit.