Resolve synchronization TODO