Added better token storage