Better handling of Oauth access tokens