Updated: storage.js to conform with new model