Better NPM integration