Made changes to how Handlebars works