Refactored GoogleAPI calls