Better support for filenames