Added database fields for groups format; group format already creates groups