Improved templates and databases