Make more node-friendly