Added commonJS support