Added tagging feature