Renamed Client to GenericClient