Added ideas for new template engine