Updated tagging structure