Added support for Oauth