Change mpi passing away from singleton