added more structure to jinja