Added CommonJS support