Replaced old Message enum class with MsgType