Updated GoogleHandler