tokens: Use the new tokens interface