Support adding events and running queries