Added tagging class