Added lock feature