More Message Map Changes