Refactored Bus and Consumer so that we only need to create one consumer
per bus.