Added more fields for Google