Adding handlebars support