Added initial code for user groups