Updated to recent handlebars