Added location functionality for organizations
: