Add fields to get_org