Add ability to include message template