Client example improvement