Updated tokenization training