Added commonjs support