Revised token storage.