Added support for original file name