Update to use Handlebars