Add support for Message Attributes