Add OrganizationField & PersonField classes