Add token editing support