Refactored some DataCollectors and specs