Added support for oauth2 service