Modifications for Node.js support