DataCollector completed, settings refactor