Tagging feature added