Database refactoring
Refactor Locker