Now handles unicode filenames