Rewritten the way the API handles tokens: