Further enhancements to messages