Enhanced templating