Added support for commonjs