adding tagging support