Improved Handlebars functionality