Updated client stub