[TASK] Improve Locker