Added Support for Message templates