Modify message to use enum class instaed of reg enum