Added some more D3 functionality