Improve structure for template.