Add support for arbitrary filenames...