Updated version for JVM client.