Rework bus API but unfortunately this is broken..