Add token filter
Use tokenFilter in Parser