Changes to accomodate Google Places and Maps API