Added token auto-registration