Add CommonJS support as well