[Sync] More updates