Add new matcher feature to templates