Add DataCollector class