Improved Jinja2 mode