Added metrics tagging