[Migration] refactor client syncing