Overhauling architecture and implementing DataCollectors/DataSources.