Make methods more clear in TemplateFactory