adding tagging infrastructure