Add CommonJS support