Adding support for VMI/MPI