Update data collection script for new format