Added some bus and data management