Making the API respect person and organization as well