Added support for tokens