Added commonjs option