Improved templates.