Updated iterator implementation of Tokens