Refactored user groups again