UPDATE: OAuth 2 support