Updated the download handler