More MPI optimization