Updated MPI implementation