Added support for "individual" affiliation.