Adding AllowGroups support