OfEvent usage improvement