Added methods to tokenizer