Update for D3 2.x