TemplateList - final changes