Support more message types