[#825] Added some data into the templates