Refactor method signatures for TemplateFactory Triggers
Closes #16