TemplateFactory - Macros now via config