Add support for unlocking nitpicking