Improve static_event_bus