various changes around data volumes