Oauth related changes