*: improved the use of template variables