Added more templating stuff