Add ability to override data type of message