* Improved support for templating