Storage TokenSelector updated