Changes to jinja templates