Support cloning of VMs - part 2