Refactoring to include more data in relay users groupings.