Use new ubiquitous token format