Updated .java files