Rebuilding Oauth support