Refactor User groups.