added email column to Person and location column to Organization