Added support for histogram and scatter plots