Updated tokenizer and english class