Update to new metrics tagging