add more message type support;