Duplicated ConnectedClient specific code from Slave to Master