Added some MPI support and some message types