Added handlebars mapping