Break the update step into a data update and a remote sync wrapper