Added OAuth 2 support