Cleanup template
Enable getting downloaded files from client
Add error handling, download and retry