Add retries/resume incase of server failure