Google provider refactored