reworked some TokenManager APIs for clarity