adding support for -hypervisor and -mgmtserver