Refactor so additional groupings can be added.