Adding better mustache/handlebars support