Made the group classes support look more like the option classes support