Handlebars changes