Refactor IrsGroup into it's own type