Added OAuth2 support