Added tooltips plus json formatting