Made LockManager a singleton to fix locking
Fixed create method