Client code updates