Adding Oauth2 support