More NPM compliance