Setup changes for handlebars