Updated with new kind of intermediate storages