Last JAVA additions