Updated for node 0.6