Added support for user tokens