Updated tokenization.