New style client tokens