Add commonjs support