fix variable name
complete the ClientMapper implementation