Java file changes for OEH