Added client mode