Added new sync handling