Updated client code base.