Lock and Unlock classes merged