Added data collection feature