Some additional chnage for handing autopickup of VM's