Add support for VM and Browser