Improve templates.