Add fields to iter_orgs