Added a tokenizer