Change VolumeManagement class to be more thread compliants