Adding more templating