Updates to support vmware