Updates to the Java 3 class