Work towards moving TagManager to the core