Tag tooling upgrade