migrate to longer token store