Updates for the TagManager code