improving the support for simple Template Engines