Improve a template structure