Token improvements