Improving Templating of messages for #8