Added tokenization