Update to use new storage system