Event system refactoring.