Added OAuth 2 compatibility