Add synchronization for live mode