Fixed commonjs and NPM support