Added OAuth tokens support