Move sync out of User