Add support for associated orgs and location coordinates.