Jinja2 templating added