Add new message support

Signed-off-by: Connor Yan <126ium@gmail.com>