Much improved handling of node.js modules