Add support for locked tags