Added more message types.