API now deals with tokens differently