Modified message controller to include name