Added groups and roles to UserRoles