Seperate iteration class
update tokenizer