Updated templating section