Added support for adding token