Adding ability to disable lock expiration