Refactor Event Model.