Client code improvements