Improve volume+snapshot code