Final Changes for Java.