Added DynamicTemplateMatcher