Support: Added token scanner