Changed the way token conversion to String