new version TokenStreamImpl