Update simulator with more event types