Use StateChangeWatcher in TokenSelector