Message - TemplateFactory added