Improve to the templating section