update Bus classes to new Rebond framework