Enhancements to the jsrender functionality