Added Groups and UserGroups support