Modified storage.js