Templating functionality added