Updated to deal with volume binding and hostnames