Update client to be message bus agnostic