Refactor group users