Improved to the templates.