Bug fixes and added support for Handlebars