Add more json data and some additional templating logic