Better organization of the coupling between MasterClient and MasterNodeClienStream