Updated the sync related functions