Update Client.java

Client - With KB changes