Updates to java files