Add VMware Support and some other features