Added handlebars support and more commonjs