Refactored connecting a hypervisor