Add support to CommonJS