Made event system more data-drivable.