Updated tagging support