Added header templating support