ENH: now using templating system