updated with handlebars support