Add TODO: filtering event types