Added lock-related stuff