Improvement 89 require handlebars directly