Adapt to the new generator storage API