Update for tokenization