more tokenfield support