Updated to work with Google OAuth2 service