Added better gooogle api handling