Add Support for CommonJS