Imporved data passing to templates & usability.