Modified templating