More code for volumes and snapshots