Refactor CategoryTags for modules