Token management updated