Updated java-part