Improved token retrieval