Upgrade to make use of node_shims