Added support for OAuth2