Update sync scheme according to spec