Improved GoogleHandler