Added support for new operations in tokenizer.