Switch to OAuth from deprecated Oauth