Disk data generation implemented along with other changes.