modified index for Groups and add