Nunjucks upgrade