Updated and improved data collection scripts