Start refactoring sync