Add some templating