Updated templating.