Updated tagging system