better handlebars support