Moving over event queries to the event model