Added support for Oauth services