Added some jinja tags