Added support for authentication tokens