Added group_id to schema