Updated methods in tokenizer