IStorage instead of StorageEngine