Add support for message template