More token handleing