Added tokens support