Updated for full hypervisor settings.