Upgraded templating