More refactoring with relay users groupings.