Improve StorageExample