Renamed the DataPointGroup class and unified the functionality