Update for handlebars support