Use proper event bus