Added ability to save datapoints