Added data collection/processing components