Added tagging option