Updated samples with recent client API changes