Attempt at NPM support