More jinja files and related changes