Added real data collection components