Fix storage data model.