Updated synchronization implementation