More NPM friendly