adding multi-vm support