Better synchronization
Locking improvements