Moved tagging out of the types themselves