better support for handlebars