Adding the TagManager changes