Add addDevice and addVMware calls