Implemented data points functionality