Fix how the message data dictionary works to make other modules easier to write