Changes for NPM