Added some templating