Changed client code base