Add support for token