Datapoint and Counting Grid classes updated