Added a file wrapper so that the original file name can be carried through