Added more message features.