Feature/token listener