Improved data collection