Added support for NPM