Prepare for MPI 1