Added CommonJS module support