Changes for virtual machine