Move to event bus-based models