Update Java client with code unification