Updated tokenizer to load on demand.