Refactor DataCollectors