Add event bus, clean logging