Improve tokenizer, add token router