[cloud-sync] - Prepare to refactor cloud sync.