Prepare for MPI 2