Added data collection for multiple events