Refactored to support single instance of bus.