Draft new storage system