Templating Added