Changes related java
Changes for java