Added support for access tokens