Refactor management of event-related components