Templating added