Add support for CommonJS