Improved generators and templates.