Add support for scatter plot