Rewrote Dson tokenizer