Integration with new bus/notification code