Changes in template engine