Templating system changed