FIX: Rework locking