Added jinja2 template system