Added message bus support