Added support for the tokens api