Added support for handlebars