Updated to changes in client object