Polishing + prepare for pluggable event bus