Updated tmpl handling