Added non-expanding tokenization