Updated Event Bus implementation.