Refactor event accessor usage