Added task handling stuff on VM