Added some kind of D3 support