Progress on TokenUtils