Add token collapsing.