Add passive and active mode for the Client