Updated JavaClient