Update to re-support upload to cloud