More updates on java files