Update to new tagging scheme