Adding template render support