Improved handling of ORIGINAL.FILE and loading property files