Client class updated