Add volume management
Add volume also to shedar config
Minor changes