added support for access tokens