Moved to nunjucks templates