Add make_bus and make changes in Bus