Add DataCollector

Fix #6
@odolbeau the base class does not handle this