Storage changes needed for batch use cases