Add DataCollector

Fix #6