Added code to allow groups to be associated with users.