Event refactor continues