Java Client section more improvements.