Add support for message options