added support for tokens